packages: NetworkManager/NetworkManager.spec, NetworkManager/libnl_noconfli...

[sls]

Author: sls                          Date: Sat Oct 15 00:07:03 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added libnl_noconflict.patch
- rm BC: libnl1-devel

---- Files affected:
packages/NetworkManager:
   NetworkManager.spec (1.93 -> 1.94) , libnl_noconflict.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/NetworkManager/NetworkManager.spec
diff -u packages/NetworkManager/NetworkManager.spec:1.93 packages/NetworkManager/NetworkManager.spec:1.94
--- packages/NetworkManager/NetworkManager.spec:1.93	Sat Oct 15 01:00:32 2011
+++ packages/NetworkManager/NetworkManager.spec	Sat Oct 15 02:06:57 2011
@@ -20,6 +20,7 @@
 Patch0:		%{name}-pld.patch
 Patch1:		ifcfg-path.patch
 Patch2:		libnl.patch
+Patch3:		libnl_noconflict.patch
 URL:		http://projects.gnome.org/NetworkManager/
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.10
@@ -48,7 +49,6 @@
 BuildRequires:	udev-glib-devel >= 147
 %{?with_wimax:BuildRequires:	wimax-devel >= 1.5.1}
 BuildRequires:	xz
-BuildConflicts:	libnl1-devel
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	ConsoleKit-x11
@@ -134,6 +134,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__gtkdocize}
@@ -291,6 +292,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.94  2011/10/15 00:06:57  sls
+- added libnl_noconflict.patch
+- rm BC: libnl1-devel
+
 Revision 1.93  2011/10/14 23:00:32  sls
 - added BuildConflict: libnl1-devel
 

================================================================
Index: packages/NetworkManager/libnl_noconflict.patch
diff -u /dev/null packages/NetworkManager/libnl_noconflict.patch:1.1
--- /dev/null	Sat Oct 15 02:07:03 2011
+++ packages/NetworkManager/libnl_noconflict.patch	Sat Oct 15 02:06:57 2011
@@ -0,0 +1,47 @@
+--- NetworkManager-0.9.1.90/configure.ac.orig	2011-10-15 01:01:08.796289042 +0200
++++ NetworkManager-0.9.1.90/configure.ac	2011-10-15 01:36:15.323576404 +0200
+@@ -321,29 +321,30 @@ AC_DEFINE_UNQUOTED(NO_CONSOLEKIT, $no_ck
+ 
+ have_libnl="no"
+ PKG_CHECK_MODULES(LIBNL1, libnl-1 >= 1.0-pre8, [have_libnl1=yes], [have_libnl1=no])
+-if (test "${have_libnl1}" = "yes"); then
+-	AC_DEFINE(HAVE_LIBNL1, 1, [Define if you require libnl-1 legacy support])
+-	LIBNL_CFLAGS="$LIBNL1_CFLAGS"
+-	LIBNL_LIBS="$LIBNL1_LIBS"
+-	libnl_version="1"
++PKG_CHECK_MODULES(LIBNL2, libnl-2.0, [have_libnl2=yes], [have_libnl2=no])
++PKG_CHECK_MODULES(LIBNL3, libnl-3.0 libnl-route-3.0, [have_libnl3=yes], [have_libnl3=no])
++if (test "${have_libnl3}" = "yes"); then
++	AC_DEFINE(HAVE_LIBNL3, 1, [Define if you require specific libnl-3 support])
++	LIBNL_CFLAGS="$LIBNL3_CFLAGS"
++	LIBNL_LIBS="$LIBNL3_LIBS"
++	libnl_version="3"
+ 	have_libnl="yes"
++	have_libnl2="no"
++	have_libnl1="no"
+ fi
+-
+-PKG_CHECK_MODULES(LIBNL2, libnl-2.0, [have_libnl2=yes], [have_libnl2=no])
+ if (test "${have_libnl2}" = "yes"); then
+ 	AC_DEFINE(HAVE_LIBNL2, 1, [Define if you require specific libnl-2 support])
+ 	LIBNL_CFLAGS="$LIBNL2_CFLAGS"
+ 	LIBNL_LIBS="$LIBNL2_LIBS"
+ 	libnl_version="2"
+ 	have_libnl="yes"
++	have_libnl1="no"
+ fi
+-
+-PKG_CHECK_MODULES(LIBNL3, libnl-3.0 libnl-route-3.0, [have_libnl3=yes], [have_libnl3=no])
+-if (test "${have_libnl3}" = "yes"); then
+-	AC_DEFINE(HAVE_LIBNL3, 1, [Define if you require specific libnl-3 support])
+-	LIBNL_CFLAGS="$LIBNL3_CFLAGS"
+-	LIBNL_LIBS="$LIBNL3_LIBS"
+-	libnl_version="3"
++if (test "${have_libnl1}" = "yes"); then
++	AC_DEFINE(HAVE_LIBNL1, 1, [Define if you require libnl-1 legacy support])
++	LIBNL_CFLAGS="$LIBNL1_CFLAGS"
++	LIBNL_LIBS="$LIBNL1_LIBS"
++	libnl_version="1"
+ 	have_libnl="yes"
+ fi
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/NetworkManager/NetworkManager.spec?r1=1.93&r2=1.94&f=u