[NetworkManager/f15] Update to 0.8.9997 (0.9 rc3) plus git snapshot
Daniel Williams
dcbw at fedoraproject.org
Tue May 31 15:21:27 UTC 2011
commit 23004fecde5fd9ff2920cbd0501865abf1ef87f5
Author: Dan Williams <dcbw at redhat.com>
Date: Tue May 31 10:23:24 2011 -0500
Update to 0.8.9997 (0.9 rc3) plus git snapshot
.gitignore | 2 +
NetworkManager.spec | 15 ++++++---
nm-applet-internal-buildfixes.patch | 54 +++++++++++++++++-----------------
nm-applet-no-notifications.patch | 6 ++--
nm-applet-wifi-dialog-ui-fixes.patch | 6 ++--
sources | 4 +-
6 files changed, 47 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b5dc8b1..dbd728e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -247,3 +247,5 @@ network-manager-applet-0.8.1.tar.bz2
/network-manager-applet-0.8.999.git20110509.tar.bz2
/NetworkManager-0.8.999-compat.git20110526.tar.bz2
/network-manager-applet-0.8.999.git20110526.tar.bz2
+/NetworkManager-0.8.9997-compat.git20110531.tar.bz2
+/network-manager-applet-0.8.9997.git20110531.tar.bz2
diff --git a/NetworkManager.spec b/NetworkManager.spec
index c336e59..8d21406 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,15 +7,15 @@
%define libnl_version 1.1
%define ppp_version 2.4.5
-%define snapshot .git20110526
-%define applet_snapshot .git20110526
-%define realversion 0.8.999
+%define snapshot .git20110531
+%define applet_snapshot .git20110531
+%define realversion 0.8.9997
Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
-Version: 0.8.999
-Release: 3%{snapshot}%{?dist}
+Version: 0.8.9997
+Release: 1%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
@@ -420,6 +420,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/gtk-doc/html/libnm-util/*
%changelog
+* Tue May 31 2011 Dan Williams <dcbw at redhat.com> - 0.8.9997-1.git20110531
+- editor: fix resizing of UI elements (rh #707269)
+- core: retry wired connections when cable is replugged
+- core: fix a few warnings and remove some left-over debugging code
+
* Thu May 26 2011 Dan Williams <dcbw at redhat.com> - 0.8.999-3.git20110526
- compat: fix activation/deactivation of VPN connections (rh #699786)
- core: fix autodetection of previously-used hidden wifi networks
diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch
index 229ea8e..4b43269 100644
--- a/nm-applet-internal-buildfixes.patch
+++ b/nm-applet-internal-buildfixes.patch
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.8.999/network-manager-applet-0.8.999/configure.ac.buildfix NetworkManager-0.8.999/network-manager-applet-0.8.999/configure.ac
---- NetworkManager-0.8.999/network-manager-applet-0.8.999/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
-+++ NetworkManager-0.8.999/network-manager-applet-0.8.999/configure.ac 2009-07-28 13:11:39.261718877 -0400
+diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/configure.ac.buildfix NetworkManager-0.8.9997/network-manager-applet-0.8.9997/configure.ac
+--- NetworkManager-0.8.9997/network-manager-applet-0.8.9997/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
++++ NetworkManager-0.8.9997/network-manager-applet-0.8.9997/configure.ac 2009-07-28 13:11:39.261718877 -0400
@@ -70,10 +70,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
PKG_CHECK_MODULES(NMA,
[dbus-glib-1 >= 0.74
@@ -24,9 +24,9 @@ diff -up NetworkManager-0.8.999/network-manager-applet-0.8.999/configure.ac.buil
;;
esac
-diff -up NetworkManager-0.8.999/network-manager-applet-0.8.999/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.999/network-manager-applet-0.8.999/src/connection-editor/Makefile.am
---- NetworkManager-0.8.999/network-manager-applet-0.8.999/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
-+++ NetworkManager-0.8.999/network-manager-applet-0.8.999/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400
+diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/connection-editor/Makefile.am
+--- NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
++++ NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400
@@ -1,5 +1,9 @@
bin_PROGRAMS = nm-connection-editor
@@ -49,9 +49,9 @@ diff -up NetworkManager-0.8.999/network-manager-applet-0.8.999/src/connection-ed
uidir = $(datadir)/nm-applet
ui_DATA = \
-diff -up NetworkManager-0.8.999/network-manager-applet-0.8.999/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.999/network-manager-applet-0.8.999/src/gconf-helpers/Makefile.am
---- NetworkManager-0.8.999/network-manager-applet-0.8.999/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
-+++ NetworkManager-0.8.999/network-manager-applet-0.8.999/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
++++ NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -1,5 +1,9 @@
SUBDIRS=. tests
@@ -82,9 +82,9 @@ diff -up NetworkManager-0.8.999/network-manager-applet-0.8.999/src/gconf-helpers
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
-diff -up NetworkManager-0.8.999/network-manager-applet-0.8.999/src/gconf-helpers/tests/Makefile.am.buildfix NetworkManager-0.8.999/network-manager-applet-0.8.999/src/gconf-helpers/tests/Makefile.am
---- NetworkManager-0.8.999/network-manager-applet-0.8.999/src/gconf-helpers/tests/Makefile.am.buildfix 2011-03-10 02:19:03.664936744 -0600
-+++ NetworkManager-0.8.999/network-manager-applet-0.8.999/src/gconf-helpers/tests/Makefile.am 2011-03-10 02:20:10.784097638 -0600
+diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gconf-helpers/tests/Makefile.am.buildfix NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gconf-helpers/tests/Makefile.am
+--- NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gconf-helpers/tests/Makefile.am.buildfix 2011-03-10 02:19:03.664936744 -0600
++++ NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gconf-helpers/tests/Makefile.am 2011-03-10 02:20:10.784097638 -0600
@@ -1,4 +1,7 @@
-INCLUDES = -I$(top_srcdir)/src/utils
+INCLUDES = -I$(top_srcdir)/src/utils \
@@ -94,9 +94,9 @@ diff -up NetworkManager-0.8.999/network-manager-applet-0.8.999/src/gconf-helpers
noinst_PROGRAMS = test-upgrade
-diff -up NetworkManager-0.8.999/network-manager-applet-0.8.999/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.999/network-manager-applet-0.8.999/src/gnome-bluetooth/Makefile.am
---- NetworkManager-0.8.999/network-manager-applet-0.8.999/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
-+++ NetworkManager-0.8.999/network-manager-applet-0.8.999/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
+diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gnome-bluetooth/Makefile.am
+--- NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
++++ NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
@@ -6,6 +6,9 @@ INCLUDES = \
-I$(top_builddir) \
-I${top_builddir}/src/marshallers \
@@ -118,9 +118,9 @@ diff -up NetworkManager-0.8.999/network-manager-applet-0.8.999/src/gnome-bluetoo
endif
EXTRA_DIST = $(BT_WIDGET_SOURCES)
-diff -up NetworkManager-0.8.999/network-manager-applet-0.8.999/src/Makefile.am.buildfix NetworkManager-0.8.999/network-manager-applet-0.8.999/src/Makefile.am
---- NetworkManager-0.8.999/network-manager-applet-0.8.999/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
-+++ NetworkManager-0.8.999/network-manager-applet-0.8.999/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/Makefile.am.buildfix NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/Makefile.am
+--- NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
++++ NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
bin_PROGRAMS = nm-applet
@@ -143,9 +143,9 @@ diff -up NetworkManager-0.8.999/network-manager-applet-0.8.999/src/Makefile.am.b
uidir = $(datadir)/nm-applet
ui_DATA = gsm-unlock.ui info.ui wired-8021x.ui wifi.ui keyring.png
-diff -up NetworkManager-0.8.999/network-manager-applet-0.8.999/src/utils/Makefile.am.buildfix NetworkManager-0.8.999/network-manager-applet-0.8.999/src/utils/Makefile.am
---- NetworkManager-0.8.999/network-manager-applet-0.8.999/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.999/network-manager-applet-0.8.999/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/utils/Makefile.am.buildfix NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/utils/Makefile.am
+--- NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -1,5 +1,9 @@
SUBDIRS=. tests
@@ -165,9 +165,9 @@ diff -up NetworkManager-0.8.999/network-manager-applet-0.8.999/src/utils/Makefil
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
+
-diff -up NetworkManager-0.8.999/network-manager-applet-0.8.999/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.999/network-manager-applet-0.8.999/src/utils/tests/Makefile.am
---- NetworkManager-0.8.999/network-manager-applet-0.8.999/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.999/network-manager-applet-0.8.999/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/utils/tests/Makefile.am
+--- NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -1,4 +1,7 @@
-INCLUDES = -I$(top_srcdir)/src/utils
+INCLUDES = -I$(top_srcdir)/src/utils \
@@ -177,9 +177,9 @@ diff -up NetworkManager-0.8.999/network-manager-applet-0.8.999/src/utils/tests/M
noinst_PROGRAMS = test-utils
-diff -up NetworkManager-0.8.999/network-manager-applet-0.8.999/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.999/network-manager-applet-0.8.999/src/wireless-security/Makefile.am
---- NetworkManager-0.8.999/network-manager-applet-0.8.999/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.999/network-manager-applet-0.8.999/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
+diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/wireless-security/Makefile.am
+--- NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
@@ -1,5 +1,9 @@
noinst_LTLIBRARIES = libwireless-security.la
diff --git a/nm-applet-no-notifications.patch b/nm-applet-no-notifications.patch
index 052dce1..73ee674 100644
--- a/nm-applet-no-notifications.patch
+++ b/nm-applet-no-notifications.patch
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.8.999/network-manager-applet-0.8.999/nm-applet.schemas.in.foo NetworkManager-0.8.999/network-manager-applet-0.8.999/nm-applet.schemas.in
---- NetworkManager-0.8.999/network-manager-applet-0.8.999/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
-+++ NetworkManager-0.8.999/network-manager-applet-0.8.999/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700
+diff -up NetworkManager-0.8.9997/network-manager-applet-0.8.9997/nm-applet.schemas.in.foo NetworkManager-0.8.9997/network-manager-applet-0.8.9997/nm-applet.schemas.in
+--- NetworkManager-0.8.9997/network-manager-applet-0.8.9997/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
++++ NetworkManager-0.8.9997/network-manager-applet-0.8.9997/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 d22a9ec..817d294 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.8.999/network-manager-applet-0.8.999/src/wireless-dialog.c NetworkManager-0.8.999/network-manager-applet-0.8.999/src/wireless-dialog.c
+diff --git NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/wireless-dialog.c NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/wireless-dialog.c
index 2cd75e0..5ae4764 100644
---- NetworkManager-0.8.999/network-manager-applet-0.8.999/src/wireless-dialog.c
-+++ NetworkManager-0.8.999/network-manager-applet-0.8.999/src/wireless-dialog.c
+--- NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/wireless-dialog.c
++++ NetworkManager-0.8.9997/network-manager-applet-0.8.9997/src/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 cb38ba5..9c2d556 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2f9d8c0d439ad5db65b50de7b59cfe92 NetworkManager-0.8.999-compat.git20110526.tar.bz2
-9dfebc8e07fcb983a55d1c924032b4e8 network-manager-applet-0.8.999.git20110526.tar.bz2
+0189b1a3e3b42bbb3dbfc0237cddf9d8 NetworkManager-0.8.9997-compat.git20110531.tar.bz2
+04b5c2f8c48ad8ab6662426e126652fb network-manager-applet-0.8.9997.git20110531.tar.bz2
More information about the scm-commits
mailing list