[NetworkManager/f13/master] Update to 0.8.3.998 (0.8.4-rc1)
Daniel Williams
dcbw at fedoraproject.org
Fri Mar 18 18:59:47 UTC 2011
commit 26f559c298460a603a28c7261e61d22cf8a4b3e9
Author: Dan Williams <dcbw at redhat.com>
Date: Fri Mar 18 10:59:11 2011 -0500
Update to 0.8.3.998 (0.8.4-rc1)
.gitignore | 2 +
NetworkManager.spec | 11 +++--
fix-glib-compat.patch | 81 -----------------------------------
nm-applet-internal-buildfixes.patch | 48 ++++++++++----------
nm-applet-no-notifications.patch | 6 +-
sources | 4 +-
6 files changed, 38 insertions(+), 114 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b33edfa..2a7395f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -225,3 +225,5 @@ network-manager-applet-0.8.1.tar.bz2
/network-manager-applet-0.8.3.996.git20110228.tar.bz2
/NetworkManager-0.8.3.997.tar.bz2
/network-manager-applet-0.8.3.997.tar.bz2
+/NetworkManager-0.8.3.998.tar.bz2
+/network-manager-applet-0.8.3.998.tar.bz2
diff --git a/NetworkManager.spec b/NetworkManager.spec
index e0e7b9c..dabd7bb 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -9,7 +9,7 @@
%define snapshot %{nil}
%define applet_snapshot %{nil}
-%define realversion 0.8.3.997
+%define realversion 0.8.3.998
%define use_systemd 0
%if 0%{?fedora} >= 15
@@ -19,7 +19,7 @@
Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
-Version: 0.8.3.997
+Version: 0.8.3.998
Release: 1%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
@@ -31,7 +31,6 @@ Source2: NetworkManager.conf
Patch1: nm-applet-internal-buildfixes.patch
Patch2: explain-dns1-dns2.patch
Patch3: nm-applet-no-notifications.patch
-Patch4: fix-glib-compat.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): chkconfig
@@ -162,7 +161,6 @@ tar -xjf %{SOURCE1}
%patch1 -p1 -b .buildfix
%patch2 -p1 -b .explain-dns1-dns2
%patch3 -p1 -b .no-notifications
-%patch4 -p1 -b .fix-glib-compat
%build
@@ -421,6 +419,11 @@ fi
%{_datadir}/gtk-doc/html/libnm-util/*
%changelog
+* Fri Mar 18 2011 Dan Williams <dcbw at redhat.com> - 0.8.3.998-1
+- Update to 0.8.3.998 (0.8.4-rc1)
+- applet: don't overwrite already migrated certificate paths (rh #682288)
+- core: fix some mistakenly invisible libnm-glib symbols
+
* Thu Mar 3 2011 Dan Williams <dcbw at redhat.com> - 0.8.3.997-1
- Update to 0.8.3.997 (0.8.4-beta3)
- editor: fix crash requesting VPN secrets (rh #680707)
diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch
index d68aaa9..84c5ec8 100644
--- a/nm-applet-internal-buildfixes.patch
+++ b/nm-applet-internal-buildfixes.patch
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/configure.ac.buildfix NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/configure.ac
---- NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
-+++ NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/configure.ac 2009-07-28 13:11:39.261718877 -0400
+diff -up NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/configure.ac.buildfix NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/configure.ac
+--- NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
++++ NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/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.3.997/network-manager-applet-0.8.3.997/configure.ac.
;;
esac
-diff -up NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/connection-editor/Makefile.am
---- NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
-+++ NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400
+diff -up NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/src/connection-editor/Makefile.am
+--- NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
++++ NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/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.3.997/network-manager-applet-0.8.3.997/src/connectio
uidir = $(datadir)/nm-applet
ui_DATA = \
-diff -up NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/gconf-helpers/Makefile.am
---- NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
-+++ NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
++++ NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/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.3.997/network-manager-applet-0.8.3.997/src/gconf-hel
+ -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.3.997/network-manager-applet-0.8.3.997/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/gnome-bluetooth/Makefile.am
---- NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
-+++ NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
+diff -up NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/src/gnome-bluetooth/Makefile.am
+--- NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
++++ NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/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.3.997/network-manager-applet-0.8.3.997/src/gnome-blu
endif
EXTRA_DIST = $(BT_WIDGET_SOURCES)
-diff -up NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/Makefile.am.buildfix NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/Makefile.am
---- NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
-+++ NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/src/Makefile.am.buildfix NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/src/Makefile.am
+--- NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
++++ NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/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.3.997/network-manager-applet-0.8.3.997/src/Makefile.
uidir = $(datadir)/nm-applet
ui_DATA = applet.ui keyring.png
-diff -up NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/utils/Makefile.am.buildfix NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/utils/Makefile.am
---- NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/src/utils/Makefile.am.buildfix NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/src/utils/Makefile.am
+--- NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/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.3.997/network-manager-applet-0.8.3.997/src/utils/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.3.997/network-manager-applet-0.8.3.997/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/utils/tests/Makefile.am
---- NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/src/utils/tests/Makefile.am
+--- NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/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.3.997/network-manager-applet-0.8.3.997/src/utils/tes
noinst_PROGRAMS = test-utils
-diff -up NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/wireless-security/Makefile.am
---- NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
+diff -up NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/src/wireless-security/Makefile.am
+--- NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/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 1e40e4b..92e8f54 100644
--- a/nm-applet-no-notifications.patch
+++ b/nm-applet-no-notifications.patch
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/nm-applet.schemas.in.foo NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/nm-applet.schemas.in
---- NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
-+++ NetworkManager-0.8.3.997/network-manager-applet-0.8.3.997/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700
+diff -up NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/nm-applet.schemas.in.foo NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/nm-applet.schemas.in
+--- NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
++++ NetworkManager-0.8.3.998/network-manager-applet-0.8.3.998/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 bdb5e36..43feda9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0f164b089d6ea5f9eacd74379bfde1fb NetworkManager-0.8.3.997.tar.bz2
-266b21e3c399bff0d6f9d55f05000684 network-manager-applet-0.8.3.997.tar.bz2
+32a7aebfa3b7abdac81203028f1d676e NetworkManager-0.8.3.998.tar.bz2
+5588075dbb037299a70c29700467aa4b network-manager-applet-0.8.3.998.tar.bz2
More information about the scm-commits
mailing list