Author: wiget Date: Sat Sep 24 16:57:31 2011 GMT Module: packages Tag: DEVEL ---- Log message: - up to 0.9.1.90
---- Files affected: packages/NetworkManager: NetworkManager.spec (1.91 -> 1.91.2.1) , libnl.patch (NONE -> 1.1.2.1) (NEW) ---- Diffs: ================================================================ Index: packages/NetworkManager/NetworkManager.spec diff -u packages/NetworkManager/NetworkManager.spec:1.91 packages/NetworkManager/NetworkManager.spec:1.91.2.1 --- packages/NetworkManager/NetworkManager.spec:1.91 Wed Sep 14 21:51:20 2011 +++ packages/NetworkManager/NetworkManager.spec Sat Sep 24 18:57:26 2011 @@ -8,17 +8,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 @@ -32,7 +33,7 @@ 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 @@ -131,6 +132,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %{__gtkdocize} @@ -288,6 +290,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.91.2.1 2011/09/24 16:57:26 wiget +- up to 0.9.1.90 + Revision 1.91 2011/09/14 19:51:20 lisu - epoch 2 ================================================================ Index: packages/NetworkManager/libnl.patch diff -u /dev/null packages/NetworkManager/libnl.patch:1.1.2.1 --- /dev/null Sat Sep 24 18:57:31 2011 +++ packages/NetworkManager/libnl.patch Sat Sep 24 18:57:26 2011 @@ -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" ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/NetworkManager/NetworkManager.spec?r1=1.91&r2=1.91.2.1&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
