- added libnl_noconflict.patch

- rm BC: libnl1-devel

Changed files:
    NetworkManager.spec -> 1.94
    libnl_noconflict.patch -> 1.1

diff --git a/NetworkManager.spec b/NetworkManager.spec
index a07c0e3b8278bd96a7b3c210a59ec69373ca4dce..bc8da1928bcb7830d0a516662dd1f7f8bb1635b3 100644 (file)
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -19,6 +19,7 @@ Source2:      %{name}.upstart
 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
@@ -47,7 +48,6 @@ BuildRequires:        udev-devel
 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
@@ -133,6 +133,7 @@ Statyczne biblioteki Network Managera.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__gtkdocize}

diff --git a/libnl_noconflict.patch b/libnl_noconflict.patch
new file mode 100644 (file)
index 0000000..53238f1
--- /dev/null
+++ b/libnl_noconflict.patch
@@ -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
+