SPECS: cryptsetup.spec - if not Obsoletes, then Conflicts: cryptse...

[qboosh]

Author: qboosh                       Date: Tue Apr  3 19:40:25 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- if not Obsoletes, then Conflicts: cryptsetup-luks*

---- Files affected:
SPECS:
   cryptsetup.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: SPECS/cryptsetup.spec
diff -u SPECS/cryptsetup.spec:1.27 SPECS/cryptsetup.spec:1.28
--- SPECS/cryptsetup.spec:1.27	Mon Apr  2 23:31:09 2007
+++ SPECS/cryptsetup.spec	Tue Apr  3 21:40:19 2007
@@ -33,6 +33,7 @@
 BuildRequires:	libgpg-error-static
 BuildRequires:	popt-static
 %endif
+Conflicts:	cryptsetup-luks
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %undefine	configure_cache
@@ -52,6 +53,7 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	device-mapper-devel
 Requires:	libgcrypt-devel >= 1.1.42
+Conflicts:	cryptsetup-luks-devel
 
 %description devel
 Header files for cryptsetup library.
@@ -64,6 +66,7 @@
 Summary(pl.UTF-8):	Statyczna biblioteka cryptsetup
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
+Conflicts:	cryptsetup-luks-static
 
 %description static
 Static version of cryptsetup library.
@@ -163,6 +166,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2007/04/03 19:40:19  qboosh
+- if not Obsoletes, then Conflicts: cryptsetup-luks*
+
 Revision 1.27  2007/04/02 21:31:09  sls
 - remove *all* Obsolete cryptsetup-luks*
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cryptsetup.spec?r1=1.27&r2=1.28&f=u