packages: libnl1/libnl1.spec - rel 3; doesn't conflict with latest libnl an...

[arekm]

Author: arekm                        Date: Sat Sep 17 07:16:04 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; doesn't conflict with latest libnl anymore

---- Files affected:
packages/libnl1:
   libnl1.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: packages/libnl1/libnl1.spec
diff -u packages/libnl1/libnl1.spec:1.35 packages/libnl1/libnl1.spec:1.36
--- packages/libnl1/libnl1.spec:1.35	Wed Sep  7 21:57:11 2011
+++ packages/libnl1/libnl1.spec	Sat Sep 17 09:15:59 2011
@@ -8,7 +8,7 @@
 %define	orgname	libnl
 Name:		%{orgname}1
 Version:	1.1
-Release:	2
+Release:	3
 License:	LGPL v2.1
 Group:		Libraries
 Source0:	http://people.suug.ch/~tgr/libnl/files/%{orgname}-%{version}.tar.gz
@@ -50,7 +50,7 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libnl1
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Conflicts:	libnl-devel
+Conflicts:	libnl-devel < 1:3.2
 
 %description devel
 Header files for libnl1 library.
@@ -63,7 +63,7 @@
 Summary(pl.UTF-8):	Statyczna biblioteka libnl1
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
-Conflicts:	libnl-static
+Conflicts:	libnl-static < 1:3.2
 
 %description static
 Static libnl1 library.
@@ -152,6 +152,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2011/09/17 07:15:59  arekm
+- rel 3; doesn't conflict with latest libnl anymore
+
 Revision 1.35  2011/09/07 19:57:11  arekm
 - rel 2; use patches from fc (drop our variants)
 
================================================================

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