[NetworkManager/f14] Update to 0.8.6-beta2
Daniel Williams
dcbw at fedoraproject.org
Tue Jul 19 22:37:34 UTC 2011
commit d4e30dcb39ef7fca4edabfa4b2b0f9b69619309c
Author: Dan Williams <dcbw at redhat.com>
Date: Tue Jul 19 17:37:09 2011 -0500
Update to 0.8.6-beta2
.gitignore | 2 +
NetworkManager.spec | 20 ++++++++---
nm-applet-internal-buildfixes.patch | 60 +++++++++++++++++-----------------
nm-applet-no-notifications.patch | 6 ++--
sources | 4 +-
5 files changed, 51 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9f6b222..0ff3922 100644
--- a/.gitignore
+++ b/.gitignore
@@ -233,3 +233,5 @@ network-manager-applet-0.8.1.tar.bz2
/network-manager-applet-0.8.4.tar.bz2
/NetworkManager-0.8.4.0.git20110622.tar.bz2
/network-manager-applet-0.8.4.git20110622.tar.bz2
+/NetworkManager-0.8.5.91.tar.bz2
+/network-manager-applet-0.8.5.91.tar.bz2
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 1943654..1abc5a5 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,21 +7,21 @@
%define libnl_version 1.1
%define ppp_version 2.4.5
-%define snapshot .git20110622
-%define applet_snapshot .git20110622
-%define realversion 0.8.4.0
+%define snapshot %{nil}
+%define applet_snapshot %{nil}
+%define realversion 0.8.5.91
Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
-Version: 0.8.4
-Release: 2%{snapshot}%{?dist}
+Version: 0.8.5.91
+Release: 1%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
Source: %{name}-%{realversion}%{snapshot}.tar.bz2
-Source1: network-manager-applet-0.8.4%{applet_snapshot}.tar.bz2
+Source1: network-manager-applet-%{realversion}%{applet_snapshot}.tar.bz2
Source2: NetworkManager.conf
Patch1: nm-applet-internal-buildfixes.patch
Patch2: explain-dns1-dns2.patch
@@ -383,6 +383,14 @@ fi
%{_datadir}/gtk-doc/html/libnm-util/*
%changelog
+* Tue Jul 19 2011 Dan Williams <dcbw at redhat.com> - 0.8.5.91-1
+- Update to 0.8.6-beta2
+- core: append interface name for IPv6 link-local DNS server addresses (rh #720001)
+- core: read anonymous identify for 802.1x PEAP connections (rh #708436)
+- core: fix setting hostname from DHCP options (rh #719100)
+- applet: don't show irrelevant security options during password requests
+- applet: show notifications on CDMA home/roaming changes
+
* Wed Jun 22 2011 Jiří Klimeš <jklimes at redhat.com> - 0.8.4-2.git20110622
- core: respect PolicyKit permissions for creating shared WiFi networks (rh #709662)
- core: fix up checks for s390 CTC device type (bgo #649025)
diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch
index 9bb94bc..a8e3afa 100644
--- a/nm-applet-internal-buildfixes.patch
+++ b/nm-applet-internal-buildfixes.patch
@@ -1,14 +1,14 @@
-diff -up NetworkManager-0.8.4/network-manager-applet-0.8.4/configure.ac.buildfix NetworkManager-0.8.4/network-manager-applet-0.8.4/configure.ac
---- NetworkManager-0.8.4/network-manager-applet-0.8.4/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
-+++ NetworkManager-0.8.4/network-manager-applet-0.8.4/configure.ac 2009-07-28 13:11:39.261718877 -0400
+diff -up NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/configure.ac.buildfix NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/configure.ac
+--- NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
++++ NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/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
glib-2.0 >= 2.16
-- NetworkManager >= 0.8.4
-- libnm-glib >= 0.8.4
-- libnm-util >= 0.8.4
-- libnm-glib-vpn >= 0.8.4
+- NetworkManager >= 0.8.5
+- libnm-glib >= 0.8.5
+- libnm-util >= 0.8.5
+- libnm-glib-vpn >= 0.8.5
gtk+-2.0 >= 2.14
gmodule-export-2.0
gconf-2.0
@@ -17,16 +17,16 @@ diff -up NetworkManager-0.8.4/network-manager-applet-0.8.4/configure.ac.buildfix
PKG_CHECK_MODULES(GNOME_BLUETOOTH,
gconf-2.0
- gnome-bluetooth-1.0 >= 2.27.6
-- libnm-util >= 0.8.4
-- libnm-glib >= 0.8.4,
+- libnm-util >= 0.8.5
+- libnm-glib >= 0.8.5,
+ gnome-bluetooth-1.0 >= 2.27.6,
have_gbt=yes, have_gbt=no)
;;
esac
-diff -up NetworkManager-0.8.4/network-manager-applet-0.8.4/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.4/network-manager-applet-0.8.4/src/connection-editor/Makefile.am
---- NetworkManager-0.8.4/network-manager-applet-0.8.4/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
-+++ NetworkManager-0.8.4/network-manager-applet-0.8.4/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400
+diff -up NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/connection-editor/Makefile.am
+--- NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
++++ NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/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.4/network-manager-applet-0.8.4/src/connection-editor
uidir = $(datadir)/nm-applet
ui_DATA = \
-diff -up NetworkManager-0.8.4/network-manager-applet-0.8.4/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.4/network-manager-applet-0.8.4/src/gconf-helpers/Makefile.am
---- NetworkManager-0.8.4/network-manager-applet-0.8.4/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
-+++ NetworkManager-0.8.4/network-manager-applet-0.8.4/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
++++ NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -1,3 +1,7 @@
+INCLUDES = -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \
@@ -69,9 +69,9 @@ diff -up NetworkManager-0.8.4/network-manager-applet-0.8.4/src/gconf-helpers/Mak
+ -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.4/network-manager-applet-0.8.4/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.4/network-manager-applet-0.8.4/src/gnome-bluetooth/Makefile.am
---- NetworkManager-0.8.4/network-manager-applet-0.8.4/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
-+++ NetworkManager-0.8.4/network-manager-applet-0.8.4/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
+diff -up NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/gnome-bluetooth/Makefile.am
+--- NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
++++ NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/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 \
@@ -93,9 +93,9 @@ diff -up NetworkManager-0.8.4/network-manager-applet-0.8.4/src/gnome-bluetooth/M
endif
EXTRA_DIST = $(BT_WIDGET_SOURCES)
-diff -up NetworkManager-0.8.4/network-manager-applet-0.8.4/src/Makefile.am.buildfix NetworkManager-0.8.4/network-manager-applet-0.8.4/src/Makefile.am
---- NetworkManager-0.8.4/network-manager-applet-0.8.4/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
-+++ NetworkManager-0.8.4/network-manager-applet-0.8.4/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/Makefile.am.buildfix NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/Makefile.am
+--- NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
++++ NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
bin_PROGRAMS = nm-applet
@@ -118,9 +118,9 @@ diff -up NetworkManager-0.8.4/network-manager-applet-0.8.4/src/Makefile.am.build
uidir = $(datadir)/nm-applet
ui_DATA = gsm-unlock.ui info.ui wired-8021x.ui wifi.ui keyring.png
-diff -up NetworkManager-0.8.4/network-manager-applet-0.8.4/src/utils/Makefile.am.buildfix NetworkManager-0.8.4/network-manager-applet-0.8.4/src/utils/Makefile.am
---- NetworkManager-0.8.4/network-manager-applet-0.8.4/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.4/network-manager-applet-0.8.4/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/utils/Makefile.am.buildfix NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/utils/Makefile.am
+--- NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -1,5 +1,9 @@
SUBDIRS=. tests
@@ -140,9 +140,9 @@ diff -up NetworkManager-0.8.4/network-manager-applet-0.8.4/src/utils/Makefile.am
+ -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.4/network-manager-applet-0.8.4/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.4/network-manager-applet-0.8.4/src/utils/tests/Makefile.am
---- NetworkManager-0.8.4/network-manager-applet-0.8.4/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.4/network-manager-applet-0.8.4/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/utils/tests/Makefile.am
+--- NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/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 \
@@ -152,9 +152,9 @@ diff -up NetworkManager-0.8.4/network-manager-applet-0.8.4/src/utils/tests/Makef
noinst_PROGRAMS = test-utils
-diff -up NetworkManager-0.8.4/network-manager-applet-0.8.4/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.4/network-manager-applet-0.8.4/src/wireless-security/Makefile.am
---- NetworkManager-0.8.4/network-manager-applet-0.8.4/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.4/network-manager-applet-0.8.4/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
+diff -up NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/wireless-security/Makefile.am
+--- NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/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 380620b..0c6b271 100644
--- a/nm-applet-no-notifications.patch
+++ b/nm-applet-no-notifications.patch
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.8.4/network-manager-applet-0.8.4/nm-applet.schemas.in.foo NetworkManager-0.8.4/network-manager-applet-0.8.4/nm-applet.schemas.in
---- NetworkManager-0.8.4/network-manager-applet-0.8.4/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
-+++ NetworkManager-0.8.4/network-manager-applet-0.8.4/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700
+diff -up NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/nm-applet.schemas.in.foo NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/nm-applet.schemas.in
+--- NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
++++ NetworkManager-0.8.5.91/network-manager-applet-0.8.5.91/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/sources b/sources
index 1b05f75..a42c5ed 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-aeef18ce1f830f8be8d4155cf4190254 NetworkManager-0.8.4.0.git20110622.tar.bz2
-9683feeb8dd994dfc2c5e68902de76cf network-manager-applet-0.8.4.git20110622.tar.bz2
+6433c2db4036663757633a1186698b98 NetworkManager-0.8.5.91.tar.bz2
+03455c3697aa44f51dc2ca8a29e3967c network-manager-applet-0.8.5.91.tar.bz2
More information about the scm-commits
mailing list