[PATCH] 02/13 e2fsprogs-fixrpm - "make rpm" fixes

Andreas Dilger <[email protected]> Wed, 2 Aug 2006 10:42:05 -0600
Newsgroups gmane.comp.file-systems.ext2.devel
Message-ID <[email protected]>
Fixes for building RPMs via "make rpm".

Index: e2fsprogs/contrib/build-rpm
===================================================================
--- e2fsprogs.orig/contrib/build-rpm	2006-07-14 09:43:36.000000000 -0600
+++ e2fsprogs/contrib/build-rpm	2006-07-10 03:41:03.000000000 -0600
@@ -21,7 +21,7 @@ cp -sR `pwd`/$currdir $tmpdir/$builddir 
 # Remove any build files from the temporary tarball directory
 [ -f $tmpdir/$builddir/Makefile ] && make -C $tmpdir/$builddir distclean
 
-EXCLUDE="--exclude .hg*"
+EXCLUDE="--exclude .hg* --exclude .pc*"
 (cd $tmpdir && tar czfh ${builddir}.tar.gz $EXCLUDE $builddir)
 
 [ "`rpmbuild --version 2> /dev/null`" ] && RPM=rpmbuild || RPM=rpm
Index: e2fsprogs/e2fsprogs.spec.in
===================================================================
--- e2fsprogs.orig/e2fsprogs.spec.in	2006-07-14 09:11:25.000000000 -0600
+++ e2fsprogs/e2fsprogs.spec.in	2006-07-14 09:19:33.000000000 -0600
@@ -1,6 +1,7 @@
 %define	_root_sbindir	/sbin
 %define	_root_libdir	/%{_lib}
 %define	_root_localedir	/usr/share/locale
+%define	_root_etcdir	/etc
 
 Summary: Utilities for managing the second extended (ext2) filesystem.
 Name: e2fsprogs
@@ -96,6 +99,7 @@ exit 0
 %{_root_sbindir}/fsck.ext3
 %{_root_sbindir}/logsave
 %{_root_sbindir}/mke2fs
+%{_root_etcdir}/mke2fs.conf
 %{_root_sbindir}/mkfs.ext2
 %{_root_sbindir}/mkfs.ext3
 %{_root_sbindir}/resize2fs
@@ -119,6 +124,9 @@ exit 0
 %{_mandir}/man1/lsattr.1*
 %{_mandir}/man1/uuidgen.1*
 
+%{_mandir}/man5/e2fsck.conf.5*
+%{_mandir}/man5/mke2fs.conf.5*
+
 %{_mandir}/man8/badblocks.8*
 %{_mandir}/man8/blkid.8*
 %{_mandir}/man8/debugfs.8*
@@ -139,14 +148,6 @@ exit 0
 %{_mandir}/man8/tune2fs.8*
 %{_mandir}/man8/filefrag.8*
 
-%{_root_localedir}/cs/LC_MESSAGES/e2fsprogs.mo
-%{_root_localedir}/de/LC_MESSAGES/e2fsprogs.mo
-%{_root_localedir}/es/LC_MESSAGES/e2fsprogs.mo
-%{_root_localedir}/it/LC_MESSAGES/e2fsprogs.mo
-%{_root_localedir}/pl/LC_MESSAGES/e2fsprogs.mo
-%{_root_localedir}/sv/LC_MESSAGES/e2fsprogs.mo
-%{_root_localedir}/tr/LC_MESSAGES/e2fsprogs.mo
-
 %files devel
 %defattr(-,root,root)
 %{_infodir}/libext2fs.info*
@@ -181,7 +182,6 @@ exit 0
 %{_includedir}/ext2fs
 %{_includedir}/ss
 %{_includedir}/uuid
-%{_includedir}/e2p/e2p.h
 %{_mandir}/man1/compile_et.1*
 %{_mandir}/man1/mk_cmds.1*
 %{_mandir}/man3/com_err.3*
Cheers, Andreas
--
Andreas Dilger
Principal Software Engineer
Cluster File Systems, Inc.


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV