From 0ae1936411d7997b50eb51bab963a3d511de1e70 Mon Sep 17 00:00:00 2001
From: Andreas Dilger <andreas.dilger@intel.com>
Date: Thu, 12 Apr 2012 15:39:04 -0600
Subject: [PATCH] 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
bs complicated by the fact that SLES and RHEL have different splits.

Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: Iab8f75a7f7bd9790899a2024d91079d55501ef65
---
 MCONFIG.in        |  4 ++--
 contrib/build-rpm |  2 +-
 e2fsprogs.spec    | 24 +++++++++++++++++-------
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/MCONFIG.in b/MCONFIG.in
index 751927f..00b68a6 100644
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -294,8 +294,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.ac
-@MAINTAINER_CMT@	cd $(top_srcdir) && autoheader && autoconf
+$(top_srcdir)/configure: $(top_srcdir)/configure.ac
+	cd $(top_srcdir) && autoheader && autoconf
 
 coverage.txt: Makefile $(SRCS)
 	if test -n "$(SRCS)"; then \
diff --git a/contrib/build-rpm b/contrib/build-rpm
index 0b06071..dfa73ad 100644
--- 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 b/e2fsprogs.spec
index f502fce..9c8eda5 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -6,13 +6,20 @@
 Summary: Utilities for managing ext2/ext3/ext4 filesystems
 Name: e2fsprogs
 Version: 1.47.2
-Release: 0
-License: GPLv2
-Group: System Environment/Base
+Release: 0%{_vendor}
+License: GPLv2 and LGPLv2
 Source:  ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
-Url: http://e2fsprogs.sourceforge.net/
-Prereq: /sbin/ldconfig
+Url: https://downloads.whamcloud.com/public/e2fsprogs/
 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 < %{version} e2fsprogs-libs < %{version}
+%endif
 
 %description
 The e2fsprogs package contains a number of utilities for creating,
@@ -36,7 +43,6 @@ fsck tool that are included here.
 Summary: Ext2 filesystem-specific static libraries and headers.
 Group: Development/Libraries
 Requires: e2fsprogs = %{version}
-Prereq: /sbin/install-info
 
 %description devel
 E2fsprogs-devel contains the libraries and header files needed to
@@ -62,7 +68,8 @@ SMP systems.
 %setup
 
 %build
-%configure --enable-elf-shlibs --enable-nls \
+%configure --enable-elf-shlibs --enable-nls --disable-defrag \
+	--enable-quota --disable-fuse2fs \
 	%{?extra_config_flags:%extra_config_flags}
 make
 make check
@@ -155,6 +162,9 @@ exit 0
 
 %{_mandir}/man5/e2fsck.conf.5*
 %{_mandir}/man5/mke2fs.conf.5*
+%{_mandir}/man5/ext2.5*
+%{_mandir}/man5/ext3.5*
+%{_mandir}/man5/ext4.5*
 
 %{_mandir}/man8/badblocks.8*
 %{_mandir}/man8/blkid.8*
-- 
1.8.3.1