- merge from DEVEL

Changed files:
    NetworkManager.spec -> 1.92
    libnl.patch -> 1.2

diff --git a/NetworkManager.spec b/NetworkManager.spec
index 4bf4cd466f9e76719cd6229504ce94bafe640ff4..593cd6e499a8ef1e32af3385f0404cc2cacb1dcd 100644 (file)
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,17 +7,18 @@
 Summary:       Network Manager for GNOME
 Summary(pl.UTF-8):     Zarządca sieci dla GNOME
 Name:          NetworkManager
-Version:       0.9.0
+Version:       0.9.1.90
 Release:       1
 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Admin
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.9/%{name}-%{version}.tar.xz
-# Source0-md5: 658f1faa6dd42a0f9a81bdff43667ab8
+# Source0-md5: c7cfb1c18c3673a8664cac3e404f5aa0
 Source1:       %{name}.conf
 Source2:       %{name}.upstart
 Patch0:                %{name}-pld.patch
 Patch1:                ifcfg-path.patch
+Patch2:                libnl.patch
 URL:           http://projects.gnome.org/NetworkManager/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.10
@@ -31,7 +32,7 @@ BuildRequires:        gtk-doc >= 1.0
 BuildRequires: gtk-doc-automake >= 1.0
 BuildRequires: intltool >= 0.40.0
 BuildRequires: libiw-devel >= 1:28-0.pre9.1
-BuildRequires: libnl1-devel >= 1.1-2
+BuildRequires: libnl-devel >= 3.0
 BuildRequires: libtool >= 2:2.2
 BuildRequires: libuuid-devel
 BuildRequires: nss-devel >= 3.11
@@ -130,6 +131,7 @@ Statyczne biblioteki Network Managera.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__gtkdocize}

diff --git a/libnl.patch b/libnl.patch
new file mode 100644 (file)
index 0000000..4648e3b
--- /dev/null
+++ b/libnl.patch
@@ -0,0 +1,51 @@
+--- NetworkManager-0.9.1.90/src/nm-system.c.wiget      2011-09-24 18:28:45.765344615 +0200
++++ NetworkManager-0.9.1.90/src/nm-system.c    2011-09-24 18:28:52.295048440 +0200
+@@ -40,7 +40,6 @@
+ #include <netdb.h>
+ #include <glib.h>
+ #include <ctype.h>
+-#include <net/if.h>
+ 
+ #include "nm-system.h"
+ #include "nm-device.h"
+--- NetworkManager-0.9.1.90/src/tests/Makefile.am.wiget        2011-09-24 18:35:29.437015456 +0200
++++ NetworkManager-0.9.1.90/src/tests/Makefile.am      2011-09-24 18:36:32.937462055 +0200
+@@ -19,6 +19,7 @@ test_dhcp_options_SOURCES = \
+ test_dhcp_options_CPPFLAGS = \
+       $(GLIB_CFLAGS) \
+       $(DBUS_CFLAGS) \
++      $(LIBNL_LIBS) \
+       -DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
+       -DDHCPCD_PATH=\"$(DHCPCD_PATH)\"
+ 
+@@ -26,6 +27,7 @@ test_dhcp_options_LDADD = \
+       $(top_builddir)/libnm-util/libnm-util.la \
+       $(top_builddir)/src/dhcp-manager/libdhcp-manager.la \
+       $(top_builddir)/src/libtest-dhcp.la \
++      $(LIBNL_LIBS) \
+       $(GLIB_LIBS) \
+       $(DBUS_LIBS)
+ 
+--- NetworkManager-0.9.1.90/src/nm-device.c.wiget      2011-09-24 18:27:57.987511424 +0200
++++ NetworkManager-0.9.1.90/src/nm-device.c    2011-09-24 18:36:58.819618527 +0200
+@@ -25,7 +25,6 @@
+ #include <dbus/dbus.h>
+ #include <netinet/in.h>
+ #include <string.h>
+-#include <net/if.h>
+ #include <unistd.h>
+ #include <errno.h>
+ #include <sys/ioctl.h>
+--- NetworkManager-0.9.1.90/configure.ac.wiget 2011-09-24 18:38:08.216462329 +0200
++++ NetworkManager-0.9.1.90/configure.ac       2011-09-24 18:39:35.251907185 +0200
+@@ -338,8 +338,8 @@ if (test "${have_libnl2}" = "yes"); then
+       have_libnl="yes"
+ fi
+ 
+-PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [have_libnl2=yes], [have_libnl2=no])
+-if (test "${have_libnl2}" = "yes"); then
++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"