[NetworkManager/f17] Update to 0.9.3.995 (0.9.4-beta1)
Daniel Williams
dcbw at fedoraproject.org
Fri Mar 2 21:23:01 UTC 2012
commit bdd8c738162767d06b25c9d7c37f7606814415a9
Author: Dan Williams <dcbw at redhat.com>
Date: Fri Mar 2 15:25:14 2012 -0600
Update to 0.9.3.995 (0.9.4-beta1)
.gitignore | 2 +
NetworkManager.spec | 17 +++++++---
applet-ignore-deprecated.patch | 18 ++--------
nm-applet-internal-buildfixes.patch | 60 +++++++++++++++++-----------------
nm-applet-no-notifications.patch | 6 ++--
nm-applet-wifi-dialog-ui-fixes.patch | 6 ++--
sources | 4 +-
7 files changed, 55 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 70045bc..007e681 100644
--- a/.gitignore
+++ b/.gitignore
@@ -268,3 +268,5 @@ network-manager-applet-0.8.1.tar.bz2
/network-manager-applet-0.9.2.0.tar.bz2
/NetworkManager-0.9.3.0.git20120215.tar.bz2
/network-manager-applet-0.9.3.0.git20120215.tar.bz2
+/NetworkManager-0.9.3.995.git20120302.tar.bz2
+/network-manager-applet-0.9.3.995.git20120302.tar.bz2
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 7d13c0c..300a24e 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 .git20120215
-%define applet_snapshot .git20120215
-%define realversion 0.9.3.0
+%define snapshot .git20120302
+%define applet_snapshot .git20120302
+%define realversion 0.9.3.995
%if 0%{?fedora} < 17
%define systemd_dir /lib/systemd/system
@@ -20,8 +20,8 @@
Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
-Version: 0.9.3
-Release: 0.3%{snapshot}%{?dist}
+Version: 0.9.3.995
+Release: 0.4%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
@@ -496,6 +496,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/libnm-gtk.so
%changelog
+* Fri Mar 2 2012 Dan Williams <dcbw at redhat.com> - 0.9.3.995-0.4
+- Update to 0.9.3.995 (0.9.4-beta1)
+- core: add support for bonding and VLAN interfaces
+- core: add support for Internet connectivity detection
+- core: add support for IPv6 Privacy Extensions
+- core: fix interaction with firewalld restarts
+
* Thu Mar 1 2012 Dan Horák <dan[at]danny.cz> - 0.9.3-0.3
- disable WiMAX plugin on s390(x)
diff --git a/applet-ignore-deprecated.patch b/applet-ignore-deprecated.patch
index 128b67c..539c284 100644
--- a/applet-ignore-deprecated.patch
+++ b/applet-ignore-deprecated.patch
@@ -1,18 +1,6 @@
-diff -up NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/m4/compiler_warnings.m4.depre NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/m4/compiler_warnings.m4
---- NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/m4/compiler_warnings.m4.depre 2011-11-10 15:03:07.528830185 -0600
-+++ NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/m4/compiler_warnings.m4 2011-11-10 15:05:28.273070638 -0600
-@@ -7,7 +7,7 @@ if test "$GCC" = "yes" -a "$set_more_war
- AC_MSG_RESULT(yes)
- CFLAGS="-Wall -Werror -std=gnu89 $CFLAGS"
-
-- for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \
-+ for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes -Wno-deprecated-declarations -Wno-error=deprecated-declarations \
- -Wdeclaration-after-statement -Wstrict-prototypes \
- -Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \
- -fno-strict-aliasing; do
-diff -up NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/configure.ac.foo NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/configure.ac
---- NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/configure.ac.foo 2011-11-10 15:10:45.268107655 -0600
-+++ NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/configure.ac 2011-11-10 15:10:51.902024720 -0600
+diff -up NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/configure.ac.foo NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/configure.ac
+--- NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/configure.ac.foo 2011-11-10 15:10:45.268107655 -0600
++++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/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 ad4dd0f..4dc1889 100644
--- a/nm-applet-internal-buildfixes.patch
+++ b/nm-applet-internal-buildfixes.patch
@@ -1,7 +1,7 @@
-Index: NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/configure.ac
+Index: NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/configure.ac
===================================================================
---- NetworkManager-0.9.3.0.orig/network-manager-applet-0.9.3.0/configure.ac
-+++ NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/configure.ac
+--- NetworkManager-0.9.3.995.orig/network-manager-applet-0.9.3.995/configure.ac
++++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/configure.ac
@@ -98,10 +98,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
PKG_CHECK_MODULES(NMA,
[dbus-glib-1 >= 0.74
@@ -23,10 +23,10 @@ Index: NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/configure.ac
have_gbt=yes, have_gbt=no)
;;
esac
-Index: NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/connection-editor/Makefile.am
+Index: NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/connection-editor/Makefile.am
===================================================================
---- NetworkManager-0.9.3.0.orig/network-manager-applet-0.9.3.0/src/connection-editor/Makefile.am
-+++ NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/connection-editor/Makefile.am
+--- NetworkManager-0.9.3.995.orig/network-manager-applet-0.9.3.995/src/connection-editor/Makefile.am
++++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/connection-editor/Makefile.am
@@ -1,5 +1,9 @@
bin_PROGRAMS = nm-connection-editor
@@ -49,10 +49,10 @@ Index: NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/connection-edit
uidir = $(datadir)/nm-applet
ui_DATA = \
-Index: NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/gconf-helpers/Makefile.am
+Index: NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/gconf-helpers/Makefile.am
===================================================================
---- NetworkManager-0.9.3.0.orig/network-manager-applet-0.9.3.0/src/gconf-helpers/Makefile.am
-+++ NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.9.3.995.orig/network-manager-applet-0.9.3.995/src/gconf-helpers/Makefile.am
++++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/gconf-helpers/Makefile.am
@@ -1,5 +1,9 @@
SUBDIRS=. tests
@@ -83,10 +83,10 @@ Index: NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/gconf-helpers/M
+ -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.0/network-manager-applet-0.9.3.0/src/gconf-helpers/tests/Makefile.am
+Index: NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/gconf-helpers/tests/Makefile.am
===================================================================
---- NetworkManager-0.9.3.0.orig/network-manager-applet-0.9.3.0/src/gconf-helpers/tests/Makefile.am
-+++ NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/gconf-helpers/tests/Makefile.am
+--- NetworkManager-0.9.3.995.orig/network-manager-applet-0.9.3.995/src/gconf-helpers/tests/Makefile.am
++++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/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.0/network-manager-applet-0.9.3.0/src/gconf-helpers/t
noinst_PROGRAMS = test-upgrade
-Index: NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/gnome-bluetooth/Makefile.am
+Index: NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/gnome-bluetooth/Makefile.am
===================================================================
---- NetworkManager-0.9.3.0.orig/network-manager-applet-0.9.3.0/src/gnome-bluetooth/Makefile.am
-+++ NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/gnome-bluetooth/Makefile.am
+--- NetworkManager-0.9.3.995.orig/network-manager-applet-0.9.3.995/src/gnome-bluetooth/Makefile.am
++++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/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.0/network-manager-applet-0.9.3.0/src/gnome-bluetooth
endif
EXTRA_DIST = $(BT_WIDGET_SOURCES)
-Index: NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/Makefile.am
+Index: NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/Makefile.am
===================================================================
---- NetworkManager-0.9.3.0.orig/network-manager-applet-0.9.3.0/src/Makefile.am
-+++ NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/Makefile.am
+--- NetworkManager-0.9.3.995.orig/network-manager-applet-0.9.3.995/src/Makefile.am
++++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/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.0/network-manager-applet-0.9.3.0/src/Makefile.am
uidir = $(datadir)/nm-applet
ui_DATA = gsm-unlock.ui info.ui wired-8021x.ui keyring.png
-Index: NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/utils/Makefile.am
+Index: NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/utils/Makefile.am
===================================================================
---- NetworkManager-0.9.3.0.orig/network-manager-applet-0.9.3.0/src/utils/Makefile.am
-+++ NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/utils/Makefile.am
+--- NetworkManager-0.9.3.995.orig/network-manager-applet-0.9.3.995/src/utils/Makefile.am
++++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/utils/Makefile.am
@@ -1,5 +1,9 @@
SUBDIRS=. tests
@@ -168,10 +168,10 @@ Index: NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/utils/Makefile.
+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.0/network-manager-applet-0.9.3.0/src/utils/tests/Makefile.am
+Index: NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/utils/tests/Makefile.am
===================================================================
---- NetworkManager-0.9.3.0.orig/network-manager-applet-0.9.3.0/src/utils/tests/Makefile.am
-+++ NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/utils/tests/Makefile.am
+--- NetworkManager-0.9.3.995.orig/network-manager-applet-0.9.3.995/src/utils/tests/Makefile.am
++++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/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.0/network-manager-applet-0.9.3.0/src/utils/tests/Mak
noinst_PROGRAMS = test-utils
-Index: NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/wireless-security/Makefile.am
+Index: NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/wireless-security/Makefile.am
===================================================================
---- NetworkManager-0.9.3.0.orig/network-manager-applet-0.9.3.0/src/wireless-security/Makefile.am
-+++ NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/wireless-security/Makefile.am
+--- NetworkManager-0.9.3.995.orig/network-manager-applet-0.9.3.995/src/wireless-security/Makefile.am
++++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/wireless-security/Makefile.am
@@ -1,5 +1,9 @@
noinst_LTLIBRARIES = libwireless-security.la
@@ -206,10 +206,10 @@ Index: NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/wireless-securi
uidir = $(datadir)/nm-applet
ui_DATA = \
-Index: NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/libnm-gtk/Makefile.am
+Index: NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/libnm-gtk/Makefile.am
===================================================================
---- NetworkManager-0.9.3.0.orig/network-manager-applet-0.9.3.0/src/libnm-gtk/Makefile.am
-+++ NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/libnm-gtk/Makefile.am
+--- NetworkManager-0.9.3.995.orig/network-manager-applet-0.9.3.995/src/libnm-gtk/Makefile.am
++++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/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 62714f1..97a1a3c 100644
--- a/nm-applet-no-notifications.patch
+++ b/nm-applet-no-notifications.patch
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/nm-applet.schemas.in.foo NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/nm-applet.schemas.in
---- NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
-+++ NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700
+diff -up NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/nm-applet.schemas.in.foo NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/nm-applet.schemas.in
+--- NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
++++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/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 65779da..734e312 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.0/network-manager-applet-0.9.3.0/src/libnm-gtk/nm-wireless-dialog.c NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/libnm-gtk/nm-wireless-dialog.c
+diff --git NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/libnm-gtk/nm-wireless-dialog.c NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/libnm-gtk/nm-wireless-dialog.c
index 2cd75e0..5ae4764 100644
---- NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/libnm-gtk/nm-wireless-dialog.c
-+++ NetworkManager-0.9.3.0/network-manager-applet-0.9.3.0/src/libnm-gtk/nm-wireless-dialog.c
+--- NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/src/libnm-gtk/nm-wireless-dialog.c
++++ NetworkManager-0.9.3.995/network-manager-applet-0.9.3.995/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 7a8c7da..d054f86 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-22086825fbbf3766fa25959809275d05 NetworkManager-0.9.3.0.git20120215.tar.bz2
-c378f3919bc963edeb65bf6b1042069c network-manager-applet-0.9.3.0.git20120215.tar.bz2
+b285d53563d09ab684db143a0bb430a6 NetworkManager-0.9.3.995.git20120302.tar.bz2
+8c51be14d788851607921a365771bd94 network-manager-applet-0.9.3.995.git20120302.tar.bz2
More information about the scm-commits
mailing list