Author: glen                         Date: Wed Apr 30 06:25:37 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- conflict version before split; rel 4

---- Files affected:
SPECS:
   e2fsprogs.spec (1.188 -> 1.189) 

---- Diffs:

================================================================
Index: SPECS/e2fsprogs.spec
diff -u SPECS/e2fsprogs.spec:1.188 SPECS/e2fsprogs.spec:1.189
--- SPECS/e2fsprogs.spec:1.188  Tue Apr 29 23:24:05 2008
+++ SPECS/e2fsprogs.spec        Wed Apr 30 08:25:31 2008
@@ -36,7 +36,7 @@
 Summary(zh_TW.UTF-8):  用於管理 ext2 檔案系統的工具程式。
 Name:          e2fsprogs
 Version:       1.40.6
-Release:       3
+Release:       4
 License:       GPL v2 (with LGPL v2 and BSD parts)
 Group:         Applications/System
 Source0:       http://dl.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
@@ -291,6 +291,7 @@
 %package libs
 Summary:       ext2 filesystem-specific libraries
 Group:         Libraries
+Conflicts:     %{name} < 1.40.6-3
 
 %description libs
 ext2 filesystem-specific libraries.
@@ -568,8 +569,8 @@
 Summary:       Check and repair a Linux file system
 Summary(pl.UTF-8):     Sprawdzenie i naprawa linuksowego systemu plików
 Group:         Applications/System
-Requires:      libuuid = %{version}-%{release}
 Requires:      %{name}-libs = %{version}-%{release}
+Requires:      libuuid = %{version}-%{release}
 
 %description -n fsck
 Check and repair a Linux file system.
@@ -863,6 +864,7 @@
 %{_infodir}/e2compr.info*
 
 %files libs
+%defattr(644,root,root,755)
 %if %{without allstatic}
 %attr(755,root,root) /%{_lib}/libblkid.so.*.*
 %attr(755,root,root) %ghost /%{_lib}/libblkid.so.1
@@ -975,6 +977,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.189  2008-04-30 06:25:31  glen
+- conflict version before split; rel 4
+
 Revision 1.188  2008-04-29 21:24:05  glen
 - separate -libs to kill main pkg dep from -devel; rel 3
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to