e2fsprogs.spec.in: Mostly synchronize spec file with the one

	found in Fedora core 2.

1 files changed, 37 insertions, 31 deletions

diff --git a/e2fsprogs.spec.in b/e2fsprogs.spec.in
index c6b7d20a..b0fd0e2d 100644
--- a/e2fsprogs.spec.in
+++ b/e2fsprogs.spec.in
@@ -14,15 +14,15 @@ BuildRoot: %{_tmppath}/%{name}-root
 
 %description
 The e2fsprogs package contains a number of utilities for creating,
-checking, modifying and correcting any inconsistencies in second
-extended (ext2) filesystems.  E2fsprogs contains e2fsck (used to repair
-filesystem inconsistencies after an unclean shutdown), mke2fs (used to
-initialize a partition to contain an empty ext2 filesystem), debugfs
-(used to examine the internal structure of a filesystem, to manually
-repair a corrupted filesystem or to create test cases for e2fsck), tune2fs
-(used to modify filesystem parameters), resize2fs to grow and shrink
-unmounted ext2 filesystems, and most of the other core ext2fs filesystem
-utilities.
+checking, modifying, and correcting any inconsistencies in second
+extended (ext2) filesystems.  E2fsprogs contains e2fsck (used to
+repair filesystem inconsistencies after an unclean shutdown), mke2fs
+(used to initialize a partition to contain an empty ext2 filesystem),
+debugfs (used to examine the internal structure of a filesystem, to
+manually repair a corrupted filesystem or to create test cases for
+e2fsck), tune2fs (used to modify filesystem parameters), resize2fs to
+grow and shrink unmounted ext2 filesystems, and most of the other core
+ext2fs filesystem utilities.
 
 You should install the e2fsprogs package if you are using any ext2
 filesystems (if you're not sure, you probably should install this
@@ -42,30 +42,22 @@ develop second extended (ext2) filesystem-specific programs.
 
 You should install e2fsprogs-devel if you want to develop ext2
 filesystem-specific programs.  If you install e2fsprogs-devel, you'll
-also need to install e2fsprogs.
+also want to install e2fsprogs.
 
 %prep
 %setup
 
-chmod 755 configure
-autoconf
-
 %build
-%configure --enable-elf-shlibs
-make libs progs docs
+%configure --enable-elf-shlibs --enable-nls
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 export PATH=/sbin:$PATH
 make install install-libs DESTDIR="$RPM_BUILD_ROOT" \
 	root_sbindir=%{_root_sbindir} root_libdir=%{_root_libdir}
-
-cd ${RPM_BUILD_ROOT}%{_libdir}
-ln -sf %{_root_libdir}/libcom_err.so.2 libcom_err.so
-ln -sf %{_root_libdir}/libe2p.so.2 libe2p.so
-ln -sf %{_root_libdir}/libext2fs.so.2 libext2fs.so
-ln -sf %{_root_libdir}/libss.so.2 libss.so
-ln -sf %{_root_libdir}/libuuid.so.1 libuuid.so
+/sbin/ldconfig -n ${RPM_BUILD_ROOT}%{_libdir}
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,20 +68,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %post devel
 if [ -x /sbin/install-info -a -f %{_infodir}/libext2fs.info.gz ]; then
-   /sbin/install-info %{_infodir}/libext2fs.info.gz %{_infodir}/dir
+    /sbin/install-info %{_infodir}/libext2fs.info.gz %{_infodir}/dir
 fi
+exit 0
 
 %postun devel
 if [ $1 = 0 -a -x /sbin/install-info -a -f %{_infodir}/libext2fs.info.gz ]; then
    /sbin/install-info --delete %{_infodir}/libext2fs.info.gz %{_infodir}/dir
 fi
+exit 0
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %doc README RELEASE-NOTES
 
-%{_root_sbindir}/blkid
 %{_root_sbindir}/badblocks
+%{_root_sbindir}/blkid
 %{_root_sbindir}/debugfs
 %{_root_sbindir}/dumpe2fs
 %{_root_sbindir}/e2fsck
@@ -105,14 +99,14 @@ fi
 %{_root_sbindir}/mkfs.ext3
 %{_root_sbindir}/resize2fs
 %{_root_sbindir}/tune2fs
-%{_sbindir}/mklost+found
 %{_sbindir}/filefrag
+%{_sbindir}/mklost+found
 
+%{_root_libdir}/libblkid.so.*
 %{_root_libdir}/libcom_err.so.*
 %{_root_libdir}/libe2p.so.*
 %{_root_libdir}/libext2fs.so.*
 %{_root_libdir}/libss.so.*
-%{_root_libdir}/libblkid.so.*
 %{_root_libdir}/libuuid.so.*
 
 %{_bindir}/chattr
@@ -148,6 +142,8 @@ fi
 %{_bindir}/compile_et
 %{_bindir}/mk_cmds
 
+%{_libdir}/libblkid.a
+%{_libdir}/libblkid.so
 %{_libdir}/libcom_err.a
 %{_libdir}/libcom_err.so
 %{_libdir}/libe2p.a
@@ -156,20 +152,30 @@ fi
 %{_libdir}/libext2fs.so
 %{_libdir}/libss.a
 %{_libdir}/libss.so
-%{_libdir}/libblkid.a
-%{_libdir}/libblkid.so
 %{_libdir}/libuuid.a
 %{_libdir}/libuuid.so
 
 %{_datadir}/et
 %{_datadir}/ss
 %{_includedir}/blkid
+%{_includedir}/e2p
 %{_includedir}/et
 %{_includedir}/ext2fs
 %{_includedir}/ss
 %{_includedir}/uuid
 %{_mandir}/man1/compile_et.1*
+%{_mandir}/man1/mk_cmds.1*
 %{_mandir}/man3/com_err.3*
-%{_mandir}/man3/libuuid.3*
-%{_mandir}/man3/uuid*.3*
 %{_mandir}/man3/libblkid.3*
+%{_mandir}/man3/libuuid.3*
+%{_mandir}/man3/uuid_clear.3*
+%{_mandir}/man3/uuid_compare.3*
+%{_mandir}/man3/uuid_copy.3*
+%{_mandir}/man3/uuid_generate.3*
+%{_mandir}/man3/uuid_generate_random.3*
+%{_mandir}/man3/uuid_generate_time.3*
+%{_mandir}/man3/uuid_is_null.3*
+%{_mandir}/man3/uuid_parse.3*
+%{_mandir}/man3/uuid_time.3*
+%{_mandir}/man3/uuid_unparse.3*
+