SPECS: e2fsprogs.spec - up to 1.40.4 (pl.po update merged; new uui...

[arekm]

Author: arekm                        Date: Mon Jan  7 08:08:32 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.40.4 (pl.po update merged; new uuidd daemon)

---- Files affected:
SPECS:
   e2fsprogs.spec (1.167 -> 1.168) 

---- Diffs:

================================================================
Index: SPECS/e2fsprogs.spec
diff -u SPECS/e2fsprogs.spec:1.167 SPECS/e2fsprogs.spec:1.168
--- SPECS/e2fsprogs.spec:1.167	Thu Jan  3 19:40:04 2008
+++ SPECS/e2fsprogs.spec	Mon Jan  7 09:08:27 2008
@@ -35,19 +35,18 @@
 Summary(zh_CN.UTF-8):	管理第二扩展（ext2）文件系统的工具。
 Summary(zh_TW.UTF-8):	用於管理 ext2 檔案系統的工具程式。
 Name:		e2fsprogs
-Version:	1.40.3
-Release:	2
+Version:	1.40.4
+Release:	1
 License:	GPL v2 (with LGPL v2 and BSD parts)
 Group:		Applications/System
 Source0:	http://dl.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
-# Source0-md5:	ad7ff4da7e200b9b25df58dc39989053
+# Source0-md5:	124d744bdf9d443591eb8193c085944b
 Source1:	e2compr-0.4.texinfo.gz
 # Source1-md5:	c3c59ff37e49d8759abb1ef95a8d3abf
 Source2:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source2-md5:	992a37783bd42a897232972917e8ca7d
 Patch0:		%{name}-info.patch
 Patch1:		e2compr-info.patch
-Patch2:		%{name}-pl.po-update.patch
 URL:		http://e2fsprogs.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -562,7 +561,6 @@
 %patch0 -p1
 gunzip < %{SOURCE1} > doc/e2compr.texinfo
 %patch1 -p1
-%patch2 -p1
 
 sed -i -e "
 	s,DEVMAPPER_REQ='libselinux libsepol',DEVMAPPER_REQ=,;
@@ -617,6 +615,8 @@
 rm -rf $RPM_BUILD_ROOT
 export PATH=/sbin:$PATH
 
+install -d $RPM_BUILD_ROOT/var/lib/libuuid
+
 echo "install-shlibs:" >> intl/Makefile
 
 %{__make} install install-libs \
@@ -678,8 +678,18 @@
 %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
+
+%postun	-n libuuid
+if [ "$1" = "0" ]; then
+	%userremove libuuid
+	%groupremove libuuid
+fi
+/sbin/ldconfig
 
 %post	-n fsck -p /sbin/ldconfig
 %postun	-n fsck -p /sbin/ldconfig
@@ -691,6 +701,7 @@
 %attr(755,root,root) /sbin/*
 %exclude /sbin/fsck
 %attr(755,root,root) %{_sbindir}/*
+%exclude %{_sbindir}/uuidd
 %attr(755,root,root) %{_bindir}/*attr
 %attr(755,root,root) %{_bindir}/mk_cmds
 %if ! %{with allstatic}
@@ -771,7 +782,9 @@
 %defattr(644,root,root,755)
 %doc lib/uuid/COPYING
 %attr(755,root,root) %{_bindir}/uuidgen
+%attr(4755,root,root) %{_sbindir}/uuidd
 %{!?with_allstatic:%attr(755,root,root) /%{_lib}/libuuid.so.*}
+%attr(750,libuuid,libuuid) /var/lib/libuuid
 %{_mandir}/man1/uuidgen.1*
 %lang(ja) %{_mandir}/ja/man1/uuidgen.1*
 
@@ -811,6 +824,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.168  2008-01-07 08:08:27  arekm
+- up to 1.40.4 (pl.po update merged; new uuidd daemon)
+
 Revision 1.167  2008-01-03 18:40:04  undefine
 - build static version blkid, using uClibc - for allow detect root=label and
   root=uuid by our initrd
================================================================

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