[NetworkManager/f14/master] Update to 0.8.2
Daniel Williams
dcbw at fedoraproject.org
Wed Nov 3 19:07:28 UTC 2010
commit 03c29ce03d39c8d5531f62253244eb1981b7fd83
Author: Dan Williams <dcbw at redhat.com>
Date: Wed Nov 3 14:04:47 2010 -0500
Update to 0.8.2
NetworkManager.spec | 25 +-
explain-dns1-dns2.patch | 38 ++--
nm-applet-internal-buildfixes.patch | 60 ++--
nm-applet-no-notifications.patch | 6 +-
nm-libnm-glib-prop-set-delay.patch | 50 ---
nm-preserve-custom-hostnames.patch | 561 ----------------------------------
nm-preserve-wifi-state.patch | 398 ------------------------
nm-prevent-hostname-dup.patch | 100 ------
nm-remove-stale-hosts-mappings.patch | 112 -------
nm-sleep-wake-no-auth.patch | 122 --------
sources | 4 +-
11 files changed, 62 insertions(+), 1414 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index fa1d88f..def0478 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,9 +7,9 @@
%define libnl_version 1.1
%define ppp_version 2.4.5
-%define snapshot .git20100831
-%define applet_snapshot .git20100831
-%define realversion 0.8.1
+%define snapshot %{nil}
+%define applet_snapshot %{nil}
+%define realversion 0.8.2
%define use_systemd 0
%if 0%{?fedora} >= 15
@@ -19,8 +19,8 @@
Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
-Version: 0.8.1
-Release: 10%{snapshot}%{?dist}
+Version: 0.8.2
+Release: 1%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
@@ -31,12 +31,6 @@ Source2: NetworkManager.conf
Patch1: nm-applet-internal-buildfixes.patch
Patch2: explain-dns1-dns2.patch
Patch3: nm-applet-no-notifications.patch
-Patch4: nm-remove-stale-hosts-mappings.patch
-Patch5: nm-preserve-custom-hostnames.patch
-Patch6: nm-prevent-hostname-dup.patch
-Patch7: nm-sleep-wake-no-auth.patch
-Patch8: nm-libnm-glib-prop-set-delay.patch
-Patch9: nm-preserve-wifi-state.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): chkconfig
@@ -167,12 +161,6 @@ tar -xjf %{SOURCE1}
%patch1 -p1 -b .buildfix
%patch2 -p1 -b .explain-dns1-dns2
%patch3 -p1 -b .no-notifications
-%patch4 -p1 -b .remove-stale-hosts-mappings
-%patch5 -p1 -b .preserve-custom-hostnames
-%patch6 -p1 -b .prevent-hostname-dup
-%patch7 -p1 -b .sleep-wake
-%patch8 -p1 -b .prop-set-delay
-%patch9 -p1 -b .wifi-state-preserve
%build
@@ -431,6 +419,9 @@ fi
%{_datadir}/gtk-doc/html/libnm-util/*
%changelog
+* Wed Nov 3 2010 Dan Williams <dcbw at redhat.com> - 0.8.2-1
+- Update to 0.8.2
+
* Mon Nov 1 2010 Dan Williams <dcbw at redhat.com> - 0.8.1-10
- core: preserve WiFi Enabled state across reboot and suspend/resume
diff --git a/explain-dns1-dns2.patch b/explain-dns1-dns2.patch
index bbfc70a..e31a0eb 100644
--- a/explain-dns1-dns2.patch
+++ b/explain-dns1-dns2.patch
@@ -1,27 +1,27 @@
-diff -up NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.explain-dns1-dns2 NetworkManager-0.7.0/src/named-manager/nm-named-manager.c
---- NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.explain-dns1-dns2 2008-09-15 10:33:29.000000000 -0400
-+++ NetworkManager-0.7.0/src/named-manager/nm-named-manager.c 2008-10-12 08:25:48.000000000 -0400
-@@ -243,7 +243,7 @@ write_resolv_conf (FILE *f, const char *
- g_free (tmp_str);
- }
+diff -up NetworkManager-0.8.2/src/dns-manager/nm-dns-manager.c.explain-dns1-dns2 NetworkManager-0.8.2/src/dns-manager/nm-dns-manager.c
+--- NetworkManager-0.8.2/src/dns-manager/nm-dns-manager.c.explain-dns1-dns2 2010-10-18 18:44:05.000000000 -0500
++++ NetworkManager-0.8.2/src/dns-manager/nm-dns-manager.c 2010-11-03 13:51:56.614584001 -0500
+@@ -358,7 +358,7 @@ write_resolv_conf (FILE *f, const char *
+
+ str = g_string_new ("");
- if (nameservers) {
+ if (nameservers && g_strv_length (nameservers)) {
- GString *str;
- int num;
+ int num = g_strv_length (nameservers);
-@@ -265,6 +265,14 @@ write_resolv_conf (FILE *f, const char *
+ for (i = 0; i < num; i++) {
+@@ -374,6 +374,14 @@ write_resolv_conf (FILE *f, const char *
+ g_string_append (str, nameservers[i]);
+ g_string_append_c (str, '\n');
}
-
- nameservers_str = g_string_free (str, FALSE);
+ } else {
-+ nameservers_str = g_strdup_printf ("\n\n%s%s%s%s%s%s",
-+ "# No nameservers found; try putting DNS servers into your\n",
-+ "# ifcfg files in /etc/sysconfig/network-scripts like so:\n",
-+ "#\n",
-+ "# DNS1=xxx.xxx.xxx.xxx\n",
-+ "# DNS2=xxx.xxx.xxx.xxx\n",
-+ "# DOMAIN=lab.foo.com bar.foo.com\n");
++ g_string_append_printf (str, "\n\n%s%s%s%s%s%s",
++ "# No nameservers found; try putting DNS servers into your\n",
++ "# ifcfg files in /etc/sysconfig/network-scripts like so:\n",
++ "#\n",
++ "# DNS1=xxx.xxx.xxx.xxx\n",
++ "# DNS2=xxx.xxx.xxx.xxx\n",
++ "# DOMAIN=lab.foo.com bar.foo.com\n");
}
- if (fprintf (f, "%s%s%s",
+ nameservers_str = g_string_free (str, FALSE);
diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch
index dade875..f920612 100644
--- a/nm-applet-internal-buildfixes.patch
+++ b/nm-applet-internal-buildfixes.patch
@@ -1,14 +1,14 @@
-diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac
---- NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
-+++ NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac 2009-07-28 13:11:39.261718877 -0400
+diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/configure.ac.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/configure.ac
+--- NetworkManager-0.8.2/network-manager-applet-0.8.2/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
++++ NetworkManager-0.8.2/network-manager-applet-0.8.2/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.1
-- libnm-glib >= 0.8.1
-- libnm-util >= 0.8.1
-- libnm-glib-vpn >= 0.8.1
+- NetworkManager >= 0.8.2
+- libnm-glib >= 0.8.2
+- libnm-util >= 0.8.2
+- libnm-glib-vpn >= 0.8.2
gtk+-2.0 >= 2.14
libglade-2.0
gmodule-export-2.0
@@ -17,16 +17,16 @@ diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac.buildfix
PKG_CHECK_MODULES(GNOME_BLUETOOTH,
gconf-2.0
- gnome-bluetooth-1.0 >= 2.27.6
-- libnm-util >= 0.8.1
-- libnm-glib >= 0.8.1,
+- libnm-util >= 0.8.2
+- libnm-glib >= 0.8.2,
+ gnome-bluetooth-1.0 >= 2.27.6,
have_gbt=yes, have_gbt=no)
;;
esac
-diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am
---- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
-+++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400
+diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/src/connection-editor/Makefile.am
+--- NetworkManager-0.8.2/network-manager-applet-0.8.2/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
++++ NetworkManager-0.8.2/network-manager-applet-0.8.2/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.1/network-manager-applet-0.8.1/src/connection-editor
gladedir = $(datadir)/nm-applet
glade_DATA = \
-diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gconf-helpers/Makefile.am
---- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
-+++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
++++ NetworkManager-0.8.2/network-manager-applet-0.8.2/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.1/network-manager-applet-0.8.1/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.1/network-manager-applet-0.8.1/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gnome-bluetooth/Makefile.am
---- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
-+++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
+diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gnome-bluetooth/Makefile.am
+--- NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
++++ NetworkManager-0.8.2/network-manager-applet-0.8.2/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.1/network-manager-applet-0.8.1/src/gnome-bluetooth/M
endif
EXTRA_DIST = $(BT_WIDGET_SOURCES)
-diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/Makefile.am
---- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
-+++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/Makefile.am.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/src/Makefile.am
+--- NetworkManager-0.8.2/network-manager-applet-0.8.2/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
++++ NetworkManager-0.8.2/network-manager-applet-0.8.2/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.1/network-manager-applet-0.8.1/src/Makefile.am.build
gladedir = $(datadir)/nm-applet
glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/Makefile.am
---- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/Makefile.am.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/Makefile.am
+--- NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.2/network-manager-applet-0.8.2/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.1/network-manager-applet-0.8.1/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.1/network-manager-applet-0.8.1/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/tests/Makefile.am
---- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/tests/Makefile.am
+--- NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.2/network-manager-applet-0.8.2/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.1/network-manager-applet-0.8.1/src/utils/tests/Makef
noinst_PROGRAMS = test-utils
-diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/wireless-security/Makefile.am
---- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
+diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/src/wireless-security/Makefile.am
+--- NetworkManager-0.8.2/network-manager-applet-0.8.2/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.2/network-manager-applet-0.8.2/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 eb254d9..e076eba 100644
--- a/nm-applet-no-notifications.patch
+++ b/nm-applet-no-notifications.patch
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/nm-applet.schemas.in.foo NetworkManager-0.8.1/network-manager-applet-0.8.1/nm-applet.schemas.in
---- NetworkManager-0.8.1/network-manager-applet-0.8.1/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
-+++ NetworkManager-0.8.1/network-manager-applet-0.8.1/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700
+diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/nm-applet.schemas.in.foo NetworkManager-0.8.2/network-manager-applet-0.8.2/nm-applet.schemas.in
+--- NetworkManager-0.8.2/network-manager-applet-0.8.2/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
++++ NetworkManager-0.8.2/network-manager-applet-0.8.2/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 2c0965d..0dad6aa 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-43c0b014895dc78e0ea9c86aa917b427 network-manager-applet-0.8.1.git20100831.tar.bz2
-23b3f273d4e24bd6b117617b6fd89861 NetworkManager-0.8.1.git20100831.tar.bz2
+dc9e73fcf67d3897af878ef2ba5c7aff NetworkManager-0.8.2.tar.bz2
+021de95fc1e943346ceea28fbaddf45f network-manager-applet-0.8.2.tar.bz2
More information about the scm-commits
mailing list