SPECS (AC-branch): e2fsprogs.spec - conflict version before split; ...

[glen]

Author: glen                         Date: Wed Apr 30 06:27:09 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- conflict version before split; rel 6

---- Files affected:
SPECS:
   e2fsprogs.spec (1.170.2.6 -> 1.170.2.7) 

---- Diffs:

================================================================
Index: SPECS/e2fsprogs.spec
diff -u SPECS/e2fsprogs.spec:1.170.2.6 SPECS/e2fsprogs.spec:1.170.2.7
--- SPECS/e2fsprogs.spec:1.170.2.6	Tue Apr 29 23:22:11 2008
+++ SPECS/e2fsprogs.spec	Wed Apr 30 08:27:04 2008
@@ -36,7 +36,7 @@
 Summary(zh_TW.UTF-8):	用於管理 ext2 檔案系統的工具程式。
 Name:		e2fsprogs
 Version:	1.40.4
-Release:	5
+Release:	6
 License:	GPL v2 (with LGPL v2 and BSD parts)
 Group:		Applications/System
 Source0:	http://dl.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
@@ -294,6 +294,8 @@
 %package libs
 Summary:	ext2 filesystem-specific libraries
 Group:		Libraries
+Conflicts:	%{name} < 1.40.4-5
+Conflicts:	fsck < 1.40.4-5
 
 %description libs
 ext2 filesystem-specific libraries.
@@ -571,8 +573,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.
@@ -869,6 +871,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
@@ -981,6 +984,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.170.2.7  2008-04-30 06:27:04  glen
+- conflict version before split; rel 6
+
 Revision 1.170.2.6  2008-04-29 21:22:11  glen
 - separate -libs to kill main pkg dep from -devel; rel 5
 
================================================================

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