packages: libnl1/libnl1.spec - ... or better Obsoletes

[arekm]

Author: arekm                        Date: Mon Mar 28 18:19:02 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ... or better Obsoletes

---- Files affected:
packages/libnl1:
   libnl1.spec (1.33 -> 1.34) 

---- Diffs:

================================================================
Index: packages/libnl1/libnl1.spec
diff -u packages/libnl1/libnl1.spec:1.33 packages/libnl1/libnl1.spec:1.34
--- packages/libnl1/libnl1.spec:1.33	Mon Mar 28 20:18:22 2011
+++ packages/libnl1/libnl1.spec	Mon Mar 28 20:18:56 2011
@@ -42,7 +42,7 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libnl1
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Obsoletes:	libnl-devel
+Conflicts:	libnl-devel
 
 %description devel
 Header files for libnl1 library.
@@ -55,7 +55,7 @@
 Summary(pl.UTF-8):	Statyczna biblioteka libnl1
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
-Obsoletes:	libnl-static
+Conflicts:	libnl-static
 
 %description static
 Static libnl1 library.
@@ -135,6 +135,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.34  2011/03/28 18:18:56  arekm
+- ... or better Obsoletes
+
 Revision 1.33  2011/03/28 18:18:22  arekm
 - devel/static obsoletes libnl devel/static
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libnl1/libnl1.spec?r1=1.33&r2=1.34&f=u