SPECS (AC-branch): e2fsprogs.spec - merge uuidd split and deps fix...

[glen]

Author: glen                         Date: Fri Feb 29 15:05:39 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge uuidd split and deps fixes from HEAD

---- Files affected:
SPECS:
   e2fsprogs.spec (1.170 -> 1.170.2.1) 

---- Diffs:

================================================================
Index: SPECS/e2fsprogs.spec
diff -u SPECS/e2fsprogs.spec:1.170 SPECS/e2fsprogs.spec:1.170.2.1
--- SPECS/e2fsprogs.spec:1.170	Fri Jan 11 00:36:53 2008
+++ SPECS/e2fsprogs.spec	Fri Feb 29 16:05:34 2008
@@ -4,7 +4,7 @@
 %bcond_with	allstatic	# link everything statically
 %bcond_without	static		# link e2fsck dynamically with libc
 %bcond_without	nls		# build without NLS
-%bcond_without	initrd		# don't build initrd version
+%bcond_with	initrd		# don't build initrd version
 %bcond_without	uClibc		# link initrd version with static glibc instead of uClibc
 #
 %ifarch sparc64 sparc
@@ -531,6 +531,34 @@
 %description -n libuuid-static -l pl.UTF-8
 Biblioteka umożliwiająca dostęp i zmiany UUID - wersja statyczna.
 
+%package -n uuidd
+Summary:	Helper daemon to guarantee uniqueness of time-based UUIDs
+Summary(pl.UTF-8):	Pomocniczy demon gwarantujący unikalność UUID-ów opartych na czasie
+License:	GPL v2
+Group:		Daemons
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/groupmod
+Requires(pre):	/usr/sbin/useradd
+Requires(pre):	/usr/sbin/usermod
+Requires:	libuuid = %{version}-%{release}
+Provides:	group(uuidd)
+Provides:	user(uuidd)
+Conflicts:	libuuid < 1.40.5-0.1
+
+%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.
+
+%description -n uuidd -l pl.UTF-8
+Ten pakiet zawiera działającego w przestrzeni użytkownika demona
+(uuidd) gwarantującego unikalność generowania UUID-ów opartych na
+czasie nawet przy bardzo dużej częstotliwości na systemach SMP.
+
 %package -n fsck
 Summary:	Check and repair a Linux file system
 Summary(pl.UTF-8):	Sprawdzenie i naprawa linuksowego systemu plików
@@ -672,27 +700,33 @@
 /sbin/ldconfig
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
-%post devel
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%post	devel -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun devel
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%postun	devel -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
 %post	-n libcom_err -p /sbin/ldconfig
 %postun	-n libcom_err -p /sbin/ldconfig
 
-%pre	-n libuuid
-%groupadd -g 222 libuuid
-%useradd -u 222 -r -d /var/lib/libuuid -s /bin/false -c "libuuid" -g libuuid libuuid
-
 %post	-n libuuid -p /sbin/ldconfig
+%postun	-n libuuid -p /sbin/ldconfig
+
+%pre	-n uuidd
+if [ "$(getgid libuuid)" = "222" ]; then
+	/usr/sbin/groupmod -n uuidd libuuid
+fi
+%groupadd -g 222 uuidd
+if [ "$(id -u libuuid 2>/dev/null)" = "222" ]; then
+	/usr/sbin/usermod -l uuidd libuuid
+fi
+%useradd -u 222 -r -d /var/lib/libuuid -s /bin/false -c "UUID generator helper daemon" -g uuidd uuidd
 
-%postun	-n libuuid
+%postun	-n uuidd
 if [ "$1" = "0" ]; then
-	%userremove libuuid
-	%groupremove libuuid
+	%userremove uuidd
+	%groupremove uuidd
 fi
-/sbin/ldconfig
 
 %post	-n fsck -p /sbin/ldconfig
 %postun	-n fsck -p /sbin/ldconfig
@@ -885,14 +919,11 @@
 %defattr(644,root,root,755)
 %doc lib/uuid/COPYING
 %attr(755,root,root) %{_bindir}/uuidgen
-%attr(6755,libuuid,libuuid) %{_sbindir}/uuidd
 %if %{without allstatic}
 %attr(755,root,root) /%{_lib}/libuuid.so.*.*
 %attr(755,root,root) %ghost /%{_lib}/libuuid.so.1
 %endif
-%attr(750,libuuid,libuuid) /var/lib/libuuid
 %{_mandir}/man1/uuidgen.1*
-%{_mandir}/man8/uuidd.8*
 %lang(ja) %{_mandir}/ja/man1/uuidgen.1*
 
 %files -n libuuid-devel
@@ -908,6 +939,12 @@
 %defattr(644,root,root,755)
 %{_libdir}/libuuid.a
 
+%files -n uuidd
+%defattr(644,root,root,755)
+%attr(2775,uuidd,uuidd) /var/lib/libuuid
+%attr(6755,uuidd,uuidd) %{_sbindir}/uuidd
+%{_mandir}/man8/uuidd.8*
+
 %files -n fsck
 %defattr(644,root,root,755)
 %attr(755,root,root) /sbin/fsck
@@ -933,6 +970,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.170.2.1  2008-02-29 15:05:34  glen
+- merge uuidd split and deps fixes from HEAD
+
 Revision 1.170  2008-01-10 23:36:53  qboosh
 - bugfixes for previous commit
 - moved uuidd(8) man page to proper package
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/e2fsprogs.spec?r1=1.170&r2=1.170.2.1&f=u