SPECS (AC-branch): e2fsprogs.spec - fix conflicts for uuidd; rel 3

[glen]

Author: glen                         Date: Wed Mar 12 00:47:35 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- fix conflicts for uuidd; rel 3

---- Files affected:
SPECS:
   e2fsprogs.spec (1.170.2.3 -> 1.170.2.4) 

---- Diffs:

================================================================
Index: SPECS/e2fsprogs.spec
diff -u SPECS/e2fsprogs.spec:1.170.2.3 SPECS/e2fsprogs.spec:1.170.2.4
--- SPECS/e2fsprogs.spec:1.170.2.3	Mon Mar 10 00:12:11 2008
+++ SPECS/e2fsprogs.spec	Wed Mar 12 01:47:29 2008
@@ -36,7 +36,7 @@
 Summary(zh_TW.UTF-8):	用於管理 ext2 檔案系統的工具程式。
 Name:		e2fsprogs
 Version:	1.40.4
-Release:	2
+Release:	3
 License:	GPL v2 (with LGPL v2 and BSD parts)
 Group:		Applications/System
 Source0:	http://dl.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
@@ -63,9 +63,9 @@
 %if %{with initrd}
 	%if %{with uClibc}
 		%ifarch ppc
-BuildRequires:  uClibc-static >= 2:0.9.29
+BuildRequires:	uClibc-static >= 2:0.9.29
 		%else
-BuildRequires:  uClibc-static >= 2:0.9.26
+BuildRequires:	uClibc-static >= 2:0.9.26
 		%endif
 	%endif
 %endif
@@ -548,7 +548,7 @@
 Requires:	libuuid = %{version}-%{release}
 Provides:	group(uuidd)
 Provides:	user(uuidd)
-Conflicts:	libuuid < 1.40.5-0.1
+Conflicts:	libuuid < 1.40.4-2
 
 %description -n uuidd
 The uuidd package contains a userspace daemon (uuidd) which guarantees
@@ -972,6 +972,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.170.2.4  2008-03-12 00:47:29  glen
+- fix conflicts for uuidd; rel 3
+
 Revision 1.170.2.3  2008-03-09 23:12:11  undefine
 - just don't use uClibc on alpha/ppc. build static with glibc is enough
 
================================================================

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