SPECS: reiserfsprogs.spec - Conflicts: progsreiserfs < 0.3.1-1.rc....

[qboosh]

Author: qboosh                       Date: Wed Nov 15 08:33:46 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Conflicts: progsreiserfs < 0.3.1-1.rc.8.5 (fsck,mkfs,resizefs,tunefs moved here)

---- Files affected:
SPECS:
   reiserfsprogs.spec (1.49 -> 1.50) 

---- Diffs:

================================================================
Index: SPECS/reiserfsprogs.spec
diff -u SPECS/reiserfsprogs.spec:1.49 SPECS/reiserfsprogs.spec:1.50
--- SPECS/reiserfsprogs.spec:1.49	Wed Nov 15 08:28:29 2006
+++ SPECS/reiserfsprogs.spec	Wed Nov 15 09:33:40 2006
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-# NOTE: conflict with progsreiserfs (fsck.reiserfs, mkfs.reiserfs, resizefs.reiserfs)
 Summary:	Utilities belonging to the Reiser filesystem
 Summary(pl):	Narzędzia dla systemu plików Reiser
 Summary(pt_BR):	Este pacote contém os utilitários para manipulaçăo do sistema de arquivos ReiserFS
@@ -19,6 +18,7 @@
 BuildRequires:	automake
 BuildRequires:	libuuid-devel
 Obsoletes:	reiserfs-utils
+Conflicts:	progsreiserfs < 0.3.1-1.rc8.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir	/sbin
@@ -98,6 +98,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.50  2006/11/15 08:33:40  qboosh
+- Conflicts: progsreiserfs < 0.3.1-1.rc.8.5 (fsck,mkfs,resizefs,tunefs moved here)
+
 Revision 1.49  2006/11/15 07:28:29  qboosh
 - avoid <asm/unaligned.h> on alpha too
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/reiserfsprogs.spec?r1=1.49&r2=1.50&f=u