build: update e2fsprogs.spec for distro builds

Add the distro version to the RPM release number, so that it the
RPM names do not conflict.

Allow the RPM built from upstream to replace the split packages
provided by the distros.  At some point in the future it may be
desirable to also split the RPM built by this spec file, but this
is complicated by the fact that SLES and RHEL have different splits.

Signed-off-by: Girish Shilamkar <girish.shilamkar@sun.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>

diff --git a/MCONFIG.in b/MCONFIG.in
index fa2b03e..8b85900 100644 (file)
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -231,8 +231,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/MCONFIG \
                $(DEP_MAKEFILE) $(top_builddir)/config.status
        cd $(top_builddir); CONFIG_FILES=$(my_dir)/Makefile ./config.status
 
-@MAINTAINER_CMT@$(top_srcdir)/configure: $(top_srcdir)/configure.in
-@MAINTAINER_CMT@       cd $(top_srcdir) && autoheader && autoconf
+$(top_srcdir)/configure: $(top_srcdir)/configure.in
+       cd $(top_srcdir) && autoheader && autoconf
 
 #
 # Make depend magic...

diff --git a/contrib/build-rpm b/contrib/build-rpm
index 0b06071..dfa73ad 100644 (file)
--- a/contrib/build-rpm
+++ b/contrib/build-rpm
@@ -29,7 +29,7 @@ cp -sR `pwd`/$currdir $tmpdir/$builddir || exit 1
 # Remove any build files from the temporary tarball directory
 [ -f $tmpdir/$builddir/Makefile ] && make -C $tmpdir/$builddir distclean
 
-EXCLUDE="--exclude .hg* --exclude .pc*"
+EXCLUDE="--exclude .hg* --exclude .pc* --exclude .git*"
 (cd $tmpdir && tar czfh ${builddir}.tar.gz $EXCLUDE $builddir)
 
 [ "`rpmbuild --version 2> /dev/null`" ] && RPM=rpmbuild || RPM=rpm

diff --git a/e2fsprogs.spec.in b/e2fsprogs.spec.in
index b188b75..d37b421 100644 (file)
--- a/e2fsprogs.spec.in
+++ b/e2fsprogs.spec.in
@@ -6,13 +6,22 @@
 Summary: Utilities for managing ext2/ext3/ext4 filesystems
 Name: e2fsprogs
 Version: @E2FSPROGS_PKGVER@
-Release: 0
-License: GPLv2
+Release: 0%{_vendor}
+License: GPLv2 and LGPLv2
 Group: System Environment/Base
 Source:  ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
-Url: http://e2fsprogs.sourceforge.net/
+Url: http://downloads.whamcloud.com/public/
 Prereq: /sbin/ldconfig
 BuildRoot: %{_tmppath}/%{name}-root
+%if %{_vendor} == "suse"
+Group: System/Filesystems
+Provides: e2fsbn ext2fs libcom_err = %{version} ldiskfsprogs = %{version}
+Obsoletes: ext2fs libcom_err < %{version}
+%else
+Group: System Environment/Base
+Provides: e2fsprogs-libs = %{version} ldiskfsprogs = %{version}
+Obsoletes: e4fsprogs e2fsprogs-libs < %{version}
+%endif
 
 %description
 The e2fsprogs package contains a number of utilities for creating,
@@ -62,7 +71,7 @@ SMP systems.
 %setup
 
 %build
-%configure --enable-elf-shlibs --enable-nls \
+%configure --enable-elf-shlibs --enable-nls --disable-defrag \
        %{?extra_config_flags:%extra_config_flags}
 make
 make check
@@ -195,6 +204,7 @@ exit 0
 %{_libdir}/libe2p.so
 %{_libdir}/libext2fs.a
 %{_libdir}/libext2fs.so
+%{_libdir}/libquota.a
 %{_libdir}/libss.a
 %{_libdir}/libss.so
 %{_libdir}/libuuid.a
@@ -204,6 +214,7 @@ exit 0
 %{_libdir}/pkgconfig/com_err.pc
 %{_libdir}/pkgconfig/e2p.pc
 %{_libdir}/pkgconfig/ext2fs.pc
+%{_libdir}/pkgconfig/quota.pc
 %{_libdir}/pkgconfig/ss.pc
 %{_libdir}/pkgconfig/uuid.pc
 
@@ -214,6 +225,7 @@ exit 0
 %{_includedir}/et
 %{_includedir}/com_err.h
 %{_includedir}/ext2fs
+%{_includedir}/quota
 %{_includedir}/ss
 %{_includedir}/uuid
 %{_mandir}/man1/compile_et.1*