e2fsck: Include the device name in the progress information

[tools/e2fsprogs.git] / e2fsprogs.spec.in

diff --git a/e2fsprogs.spec.in b/e2fsprogs.spec.in
index bf78ebb..3e7d1ee 100644 (file)
--- a/e2fsprogs.spec.in
+++ b/e2fsprogs.spec.in
@@ -1,10 +1,11 @@
 %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
-Version: @E2FSPROGS_VERSION@
+Version: @E2FSPROGS_PKGVER@
 Release: 0
 License: GPLv2
 Group: System Environment/Base
@@ -45,12 +46,25 @@ You should install e2fsprogs-devel if you want to develop ext2
 filesystem-specific programs.  If you install e2fsprogs-devel, you'll
 also want to install e2fsprogs.
 
+%package -n uuidd
+Summary: helper daemon to guarantee uniqueness of time-based UUIDs
+Group: System Environment/Daemons
+License: GPLv2
+Requires: e2fsprogs = %{version}
+Requires(pre): shadow-utils
+
+%description -n uuidd
+The uuidd package contains a userspace daemon (uuidd) which guarantees
+uniqueness of time-based UUID generation even at very high rates on
+SMP systems.
+
 %prep
 %setup
 
 %build
 %configure --enable-elf-shlibs --enable-nls
 make
+make check
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -58,6 +72,10 @@ export PATH=/sbin:$PATH
 make install install-libs DESTDIR="$RPM_BUILD_ROOT" \
        root_sbindir=%{_root_sbindir} root_libdir=%{_root_libdir}
 /sbin/ldconfig -n ${RPM_BUILD_ROOT}%{_libdir}
+
+# Add a dir that uuidd needs that the Makefiles don't create
+install -d $RPM_BUILD_ROOT/var/lib/libuuid
+
 %find_lang %{name}
 
 %clean
@@ -79,6 +97,13 @@ if [ $1 = 0 -a -x /sbin/install-info -a -f %{_infodir}/libext2fs.info.gz ]; then
 fi
 exit 0
 
+%pre -n uuidd
+getent group uuidd >/dev/null || groupadd -r uuidd
+getent passwd uuidd >/dev/null || \
+useradd -r -g uuidd -d /var/lib/libuuid -s /sbin/nologin \
+    -c "UUID generator helper daemon" uuidd
+exit 0
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README RELEASE-NOTES
@@ -96,6 +121,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 +145,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 +168,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*
@@ -197,3 +218,11 @@ exit 0
 %{_mandir}/man3/uuid_time.3*
 %{_mandir}/man3/uuid_unparse.3*
 
+%files -n uuidd
+%defattr(-,root,root)
+# if you want to run via init
+# /etc/init.d/uuidd
+%{_mandir}/man8/uuidd.8*
+%attr(6755, uuidd, uuidd) %{_sbindir}/uuidd
+%dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
+