- updated to 0.9.2.0

- removed libnl.patch and libnl_noconflict.patch (fixed upstream)

Changed files:
    NetworkManager.spec -> 1.95
    libnl.patch -> 1.3
    libnl_noconflict.patch -> 1.2

diff --git a/NetworkManager.spec b/NetworkManager.spec
index bc8da1928bcb7830d0a516662dd1f7f8bb1635b3..9f77edd44cac342861eda030a80e91ab264e175f 100644 (file)
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,19 +7,17 @@
 Summary:       Network Manager for GNOME
 Summary(pl.UTF-8):     Zarządca sieci dla GNOME
 Name:          NetworkManager
-Version:       0.9.1.90
+Version:       0.9.2.0
 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: c7cfb1c18c3673a8664cac3e404f5aa0
+# Source0-md5: d7dce01e97758253bc4ed81d7b86045f
 Source1:       %{name}.conf
 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
@@ -132,8 +130,6 @@ Statyczne biblioteki Network Managera.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__gtkdocize}

diff --git a/libnl.patch b/libnl.patch
deleted file mode 100644 (file)
index 4648e3b..0000000
--- a/libnl.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- 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"

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