[NetworkManager/f17] Updated to 0.9.4
Jirka Klimes
jklimes at fedoraproject.org
Wed Mar 28 08:31:50 UTC 2012
commit fa6a55c95fc3b21fac1ceadfa6e3143af184827d
Author: Jiří Klimeš <jklimes at redhat.com>
Date: Wed Mar 28 09:51:45 2012 +0200
Updated to 0.9.4
.gitignore | 3 +
NetworkManager.spec | 13 ++++--
applet-ignore-deprecated.patch | 6 +-
nm-applet-internal-buildfixes.patch | 72 +++++++++++++++++-----------------
nm-applet-no-notifications.patch | 6 +-
nm-applet-wifi-dialog-ui-fixes.patch | 6 +-
sources | 4 +-
7 files changed, 59 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4c9b4eb..e47cd6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -278,3 +278,6 @@ network-manager-applet-0.8.1.tar.bz2
/network-manager-applet-0.9.3.997.tar.bz2
/NetworkManager-0.9.3.997.git20120321.tar.bz2
/network-manager-applet-0.9.3.997.git20120321.tar.bz2
+/NetworkManager-0.9.4.0.git20120328.tar.bz2
+/network-manager-applet-0.9.4.1.git20120328.tar.bz2
+/network-manager-applet-0.9.4.0.git20120328.tar.bz2
diff --git a/NetworkManager.spec b/NetworkManager.spec
index d92a159..81fbc9b 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,9 +7,9 @@
%define libnl3_version 3.2.6
%define ppp_version 2.4.5
-%define snapshot .git20120321
-%define applet_snapshot .git20120321
-%define realversion 0.9.3.997
+%define snapshot .git20120328
+%define applet_snapshot .git20120328
+%define realversion 0.9.4.0
%if 0%{?fedora} < 17
%define systemd_dir /lib/systemd/system
@@ -20,7 +20,7 @@
Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
-Version: 0.9.3.997
+Version: 0.9.4.0
Release: 1%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
@@ -493,6 +493,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/libnm-gtk.so
%changelog
+* Wed Mar 28 2012 Jiří Klimeš <jklimes at redhat.com> - 0.9.4.0-1.git20120328
+- Update to 0.9.4 release
+- libnm-glib: ensure bindings-created NMClient object really work (rh #802536)
+- libnm-glib: initialize NMRemoteSettings in nm_remote_settings_new() (rh #806664)
+
* Mon Mar 19 2012 Dan Williams <dcbw at redhat.com> - 0.9.3.997-1
- core: set firewall zone before starting IP configuration (rh #805405)
- core: fix default route when overriding VPN server-provided routes (rh #804563)
diff --git a/applet-ignore-deprecated.patch b/applet-ignore-deprecated.patch
index a1de306..e9495a4 100644
--- a/applet-ignore-deprecated.patch
+++ b/applet-ignore-deprecated.patch
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/configure.ac.foo NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/configure.ac
---- NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/configure.ac.foo 2011-11-10 15:10:45.268107655 -0600
-+++ NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/configure.ac 2011-11-10 15:10:51.902024720 -0600
+diff -up NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/configure.ac.foo NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/configure.ac
+--- NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/configure.ac.foo 2011-11-10 15:10:45.268107655 -0600
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/configure.ac 2011-11-10 15:10:51.902024720 -0600
@@ -179,8 +179,6 @@ dnl
dnl Compiler flags
dnl
diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch
index 4c437ed..8b88ec5 100644
--- a/nm-applet-internal-buildfixes.patch
+++ b/nm-applet-internal-buildfixes.patch
@@ -1,15 +1,15 @@
-Index: NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/configure.ac
+Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/configure.ac
===================================================================
---- NetworkManager-0.9.3.997.orig/network-manager-applet-0.9.3.997/configure.ac
-+++ NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/configure.ac
+--- NetworkManager-0.9.4.0.orig/network-manager-applet-0.9.4.0/configure.ac
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/configure.ac
@@ -98,10 +98,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
PKG_CHECK_MODULES(NMA,
[dbus-glib-1 >= 0.74
glib-2.0 >= 2.16
-- NetworkManager >= 0.9.3
-- libnm-glib >= 0.9.3
-- libnm-util >= 0.9.3
-- libnm-glib-vpn >= 0.9.3
+- NetworkManager >= 0.9.4
+- libnm-glib >= 0.9.4
+- libnm-util >= 0.9.4
+- libnm-glib-vpn >= 0.9.4
gmodule-export-2.0])
PKG_CHECK_MODULES(GCONF, [gconf-2.0])
@@ -17,16 +17,16 @@ Index: NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/configure.ac
AC_MSG_CHECKING(for gnome-bluetooth)
PKG_CHECK_MODULES(GNOME_BLUETOOTH,
gnome-bluetooth-1.0 >= 2.27.6
-- libnm-util >= 0.9.3
-- libnm-glib >= 0.9.3,
+- libnm-util >= 0.9.4
+- libnm-glib >= 0.9.4,
+ dbus-glib-1,
have_gbt=yes, have_gbt=no)
;;
esac
-Index: NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/connection-editor/Makefile.am
+Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/connection-editor/Makefile.am
===================================================================
---- NetworkManager-0.9.3.997.orig/network-manager-applet-0.9.3.997/src/connection-editor/Makefile.am
-+++ NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/connection-editor/Makefile.am
+--- NetworkManager-0.9.4.0.orig/network-manager-applet-0.9.4.0/src/connection-editor/Makefile.am
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/connection-editor/Makefile.am
@@ -1,5 +1,9 @@
bin_PROGRAMS = nm-connection-editor
@@ -49,10 +49,10 @@ Index: NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/connection-
uidir = $(datadir)/nm-applet
ui_DATA = \
-Index: NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/gconf-helpers/Makefile.am
+Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/gconf-helpers/Makefile.am
===================================================================
---- NetworkManager-0.9.3.997.orig/network-manager-applet-0.9.3.997/src/gconf-helpers/Makefile.am
-+++ NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.9.4.0.orig/network-manager-applet-0.9.4.0/src/gconf-helpers/Makefile.am
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/gconf-helpers/Makefile.am
@@ -1,5 +1,9 @@
SUBDIRS=. tests
@@ -83,10 +83,10 @@ Index: NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/gconf-helpe
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
-Index: NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/gconf-helpers/tests/Makefile.am
+Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/gconf-helpers/tests/Makefile.am
===================================================================
---- NetworkManager-0.9.3.997.orig/network-manager-applet-0.9.3.997/src/gconf-helpers/tests/Makefile.am
-+++ NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/gconf-helpers/tests/Makefile.am
+--- NetworkManager-0.9.4.0.orig/network-manager-applet-0.9.4.0/src/gconf-helpers/tests/Makefile.am
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/gconf-helpers/tests/Makefile.am
@@ -1,4 +1,7 @@
-INCLUDES = -I$(top_srcdir)/src/utils
+INCLUDES = -I$(top_srcdir)/src/utils \
@@ -96,10 +96,10 @@ Index: NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/gconf-helpe
noinst_PROGRAMS = test-upgrade
-Index: NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/gnome-bluetooth/Makefile.am
+Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/gnome-bluetooth/Makefile.am
===================================================================
---- NetworkManager-0.9.3.997.orig/network-manager-applet-0.9.3.997/src/gnome-bluetooth/Makefile.am
-+++ NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/gnome-bluetooth/Makefile.am
+--- NetworkManager-0.9.4.0.orig/network-manager-applet-0.9.4.0/src/gnome-bluetooth/Makefile.am
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/gnome-bluetooth/Makefile.am
@@ -6,6 +6,9 @@ INCLUDES = \
-I${top_builddir}/src/marshallers \
-I${top_srcdir}/src/utils \
@@ -121,10 +121,10 @@ Index: NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/gnome-bluet
endif
EXTRA_DIST = $(BT_WIDGET_SOURCES)
-Index: NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/Makefile.am
+Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/Makefile.am
===================================================================
---- NetworkManager-0.9.3.997.orig/network-manager-applet-0.9.3.997/src/Makefile.am
-+++ NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/Makefile.am
+--- NetworkManager-0.9.4.0.orig/network-manager-applet-0.9.4.0/src/Makefile.am
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/Makefile.am
@@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
bin_PROGRAMS = nm-applet
@@ -147,10 +147,10 @@ Index: NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/Makefile.am
uidir = $(datadir)/nm-applet
ui_DATA = gsm-unlock.ui info.ui wired-8021x.ui keyring.png
-Index: NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/utils/Makefile.am
+Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/utils/Makefile.am
===================================================================
---- NetworkManager-0.9.3.997.orig/network-manager-applet-0.9.3.997/src/utils/Makefile.am
-+++ NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/utils/Makefile.am
+--- NetworkManager-0.9.4.0.orig/network-manager-applet-0.9.4.0/src/utils/Makefile.am
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/utils/Makefile.am
@@ -1,5 +1,9 @@
SUBDIRS=. tests
@@ -168,10 +168,10 @@ Index: NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/utils/Makef
+libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS) $(GNOME_KEYRING_LIBS) \
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
-Index: NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/utils/tests/Makefile.am
+Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/utils/tests/Makefile.am
===================================================================
---- NetworkManager-0.9.3.997.orig/network-manager-applet-0.9.3.997/src/utils/tests/Makefile.am
-+++ NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/utils/tests/Makefile.am
+--- NetworkManager-0.9.4.0.orig/network-manager-applet-0.9.4.0/src/utils/tests/Makefile.am
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/utils/tests/Makefile.am
@@ -1,4 +1,7 @@
-INCLUDES = -I$(top_srcdir)/src/utils
+INCLUDES = -I$(top_srcdir)/src/utils \
@@ -181,10 +181,10 @@ Index: NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/utils/tests
noinst_PROGRAMS = test-utils
-Index: NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/wireless-security/Makefile.am
+Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/wireless-security/Makefile.am
===================================================================
---- NetworkManager-0.9.3.997.orig/network-manager-applet-0.9.3.997/src/wireless-security/Makefile.am
-+++ NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/wireless-security/Makefile.am
+--- NetworkManager-0.9.4.0.orig/network-manager-applet-0.9.4.0/src/wireless-security/Makefile.am
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/wireless-security/Makefile.am
@@ -1,5 +1,9 @@
noinst_LTLIBRARIES = libwireless-security.la
@@ -206,10 +206,10 @@ Index: NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/wireless-se
uidir = $(datadir)/nm-applet
ui_DATA = \
-Index: NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/libnm-gtk/Makefile.am
+Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/libnm-gtk/Makefile.am
===================================================================
---- NetworkManager-0.9.3.997.orig/network-manager-applet-0.9.3.997/src/libnm-gtk/Makefile.am
-+++ NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/libnm-gtk/Makefile.am
+--- NetworkManager-0.9.4.0.orig/network-manager-applet-0.9.4.0/src/libnm-gtk/Makefile.am
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/libnm-gtk/Makefile.am
@@ -1,3 +1,7 @@
+INCLUDES = -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \
diff --git a/nm-applet-no-notifications.patch b/nm-applet-no-notifications.patch
index aaff368..a76cd6e 100644
--- a/nm-applet-no-notifications.patch
+++ b/nm-applet-no-notifications.patch
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/nm-applet.schemas.in.foo NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/nm-applet.schemas.in
---- NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
-+++ NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700
+diff -up NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/nm-applet.schemas.in.foo NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/nm-applet.schemas.in
+--- NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700
@@ -6,7 +6,7 @@
<applyto>/apps/nm-applet/disable-connected-notifications</applyto>
<owner>nm-applet</owner>
diff --git a/nm-applet-wifi-dialog-ui-fixes.patch b/nm-applet-wifi-dialog-ui-fixes.patch
index 79702ca..816e7bc 100644
--- a/nm-applet-wifi-dialog-ui-fixes.patch
+++ b/nm-applet-wifi-dialog-ui-fixes.patch
@@ -1,7 +1,7 @@
-diff --git NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/libnm-gtk/nm-wireless-dialog.c NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/libnm-gtk/nm-wireless-dialog.c
+diff --git NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/libnm-gtk/nm-wireless-dialog.c NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/libnm-gtk/nm-wireless-dialog.c
index 2cd75e0..5ae4764 100644
---- NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/libnm-gtk/nm-wireless-dialog.c
-+++ NetworkManager-0.9.3.997/network-manager-applet-0.9.3.997/src/libnm-gtk/nm-wireless-dialog.c
+--- NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/libnm-gtk/nm-wireless-dialog.c
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/libnm-gtk/nm-wireless-dialog.c
@@ -1151,24 +1151,28 @@ internal_init (NMAWirelessDialog *self,
tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the wireless network '%s'."),
diff --git a/sources b/sources
index c3f15f3..522360b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-039843253a002249528323780e1bb0f7 NetworkManager-0.9.3.997.git20120321.tar.bz2
-150df28daf22ca6fcda909be3f4493eb network-manager-applet-0.9.3.997.git20120321.tar.bz2
+019977d861ff17aa7a51a5393ef8d218 NetworkManager-0.9.4.0.git20120328.tar.bz2
+042b3c02f087e44d9ca11ed7a2172a41 network-manager-applet-0.9.4.0.git20120328.tar.bz2
More information about the scm-commits
mailing list