[NetworkManager/f15/master] Update to 0.8.996 (0.9-beta2)
Daniel Williams
dcbw at fedoraproject.org
Thu Mar 10 08:28:57 UTC 2011
commit 9ecebdb3d310494c06398ebc07ef6a7f3fad0036
Author: Dan Williams <dcbw at redhat.com>
Date: Thu Mar 10 02:28:55 2011 -0600
Update to 0.8.996 (0.9-beta2)
NetworkManager.spec | 15 +++--
nm-applet-bus-name.patch | 33 ----------
nm-applet-internal-buildfixes.patch | 117 +++++++++++++++++++++--------------
nm-applet-no-notifications.patch | 6 +-
sources | 2 -
5 files changed, 82 insertions(+), 91 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 05b1e3e..fcc4b64 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,9 +7,9 @@
%define libnl_version 1.1
%define ppp_version 2.4.5
-%define snapshot .git20110308
-%define applet_snapshot .git20110308
-%define realversion 0.8.995
+%define snapshot %{nil}
+%define applet_snapshot %{nil}
+%define realversion 0.8.996
%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.995
-Release: 4%{snapshot}%{?dist}
+Version: 0.8.996
+Release: 1%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
@@ -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: nm-applet-bus-name.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): chkconfig
@@ -169,7 +168,6 @@ tar -xjf %{SOURCE1}
%patch1 -p1 -b .buildfix
%patch2 -p1 -b .explain-dns1-dns2
%patch3 -p1 -b .no-notifications
-%patch4 -p1 -b .applet-bus-name
%build
@@ -435,6 +433,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/gtk-doc/html/libnm-util/*
%changelog
+* Thu Mar 10 2011 Dan Williams <dcbw at redhat.com> - 0.8.996-1
+- Update to 0.8.996 (0.9-beta2)
+
* Wed Mar 9 2011 Dan Williams <dcbw at redhat.com> - 0.8.995-4.git20110308
- applet: fix bus name more
diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch
index c35b877..d030201 100644
--- a/nm-applet-internal-buildfixes.patch
+++ b/nm-applet-internal-buildfixes.patch
@@ -1,21 +1,21 @@
-diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/configure.ac.buildfix NetworkManager-0.8.995/network-manager-applet-0.8.995/configure.ac
---- NetworkManager-0.8.995/network-manager-applet-0.8.995/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
-+++ NetworkManager-0.8.995/network-manager-applet-0.8.995/configure.ac 2009-07-28 13:11:39.261718877 -0400
+diff -up NetworkManager-0.8.996/network-manager-applet-0.8.996/configure.ac.buildfix NetworkManager-0.8.996/network-manager-applet-0.8.996/configure.ac
+--- NetworkManager-0.8.996/network-manager-applet-0.8.996/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
++++ NetworkManager-0.8.996/network-manager-applet-0.8.996/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.995
-- libnm-glib >= 0.8.995
-- libnm-util >= 0.8.995
-- libnm-glib-vpn >= 0.8.995
- gmodule-export-2.0
- gconf-2.0
- gnome-keyring-1
+- NetworkManager >= 0.8.996
+- libnm-glib >= 0.8.996
+- libnm-util >= 0.8.996
+- libnm-glib-vpn >= 0.8.996
+ gmodule-export-2.0])
+
+ PKG_CHECK_MODULES(GCONF, [gconf-2.0])
@@ -192,9 +188,7 @@ AC_SUBST(DBUS_SYS_DIR)
+ *)
AC_MSG_CHECKING(for gnome-bluetooth)
PKG_CHECK_MODULES(GNOME_BLUETOOTH,
- gconf-2.0
- gnome-bluetooth-1.0 >= 2.27.6
- libnm-util >= 0.8.995
- libnm-glib >= 0.8.995,
@@ -24,9 +24,9 @@ diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/configure.ac.buil
;;
esac
-diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.995/network-manager-applet-0.8.995/src/connection-editor/Makefile.am
---- NetworkManager-0.8.995/network-manager-applet-0.8.995/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
-+++ NetworkManager-0.8.995/network-manager-applet-0.8.995/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400
+diff -up NetworkManager-0.8.996/network-manager-applet-0.8.996/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.996/network-manager-applet-0.8.996/src/connection-editor/Makefile.am
+--- NetworkManager-0.8.996/network-manager-applet-0.8.996/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
++++ NetworkManager-0.8.996/network-manager-applet-0.8.996/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400
@@ -1,5 +1,9 @@
bin_PROGRAMS = nm-connection-editor
@@ -49,29 +49,54 @@ diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/connection-ed
uidir = $(datadir)/nm-applet
ui_DATA = \
-diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.995/network-manager-applet-0.8.995/src/gconf-helpers/Makefile.am
---- NetworkManager-0.8.995/network-manager-applet-0.8.995/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
-+++ NetworkManager-0.8.995/network-manager-applet-0.8.995/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
-@@ -1,3 +1,7 @@
+diff -up NetworkManager-0.8.996/network-manager-applet-0.8.996/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.996/network-manager-applet-0.8.996/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.8.996/network-manager-applet-0.8.996/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
++++ NetworkManager-0.8.996/network-manager-applet-0.8.996/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+@@ -1,5 +1,9 @@
+ SUBDIRS=. tests
+
+INCLUDES = -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \
+ -I${top_srcdir}/../libnm-glib
+
- noinst_LTLIBRARIES = libgconf-helpers.la
-
- libgconf_helpers_la_SOURCES = \
-@@ -19,5 +23,7 @@ libgconf_helpers_la_CPPFLAGS = \
- libgconf_helpers_la_LIBADD = \
+ noinst_LTLIBRARIES = \
+ libgconf-helpers.la \
+ libgconf-helpers-test.la
+@@ -23,7 +27,9 @@ libgconf_helpers_la_LIBADD = \
$(GTK_LIBS) \
$(NMA_LIBS) \
-- ${top_builddir}/src/utils/libutils.la
-+ ${top_builddir}/src/utils/libutils.la \
+ $(GCONF_LIBS) \
+- $(GNOME_KEYRING_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
+
+ #########################
+ # Test library
+@@ -40,5 +46,7 @@ libgconf_helpers_test_la_CPPFLAGS = \
+
+ # no keyring or gconf libs since we'll override them
+ libgconf_helpers_test_la_LIBADD = \
+- $(NMA_LIBS)
++ $(NMA_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
-diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.995/network-manager-applet-0.8.995/src/gnome-bluetooth/Makefile.am
---- NetworkManager-0.8.995/network-manager-applet-0.8.995/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
-+++ NetworkManager-0.8.995/network-manager-applet-0.8.995/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
+diff -up NetworkManager-0.8.996/network-manager-applet-0.8.996/src/gconf-helpers/tests/Makefile.am.buildfix NetworkManager-0.8.996/network-manager-applet-0.8.996/src/gconf-helpers/tests/Makefile.am
+--- NetworkManager-0.8.996/network-manager-applet-0.8.996/src/gconf-helpers/tests/Makefile.am.buildfix 2011-03-10 02:19:03.664936744 -0600
++++ NetworkManager-0.8.996/network-manager-applet-0.8.996/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 \
++ -I${top_srcdir}/../include \
++ -I${top_srcdir}/../libnm-util \
++ -I${top_srcdir}/../libnm-glib
+
+ noinst_PROGRAMS = test-upgrade
+
+diff -up NetworkManager-0.8.996/network-manager-applet-0.8.996/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.996/network-manager-applet-0.8.996/src/gnome-bluetooth/Makefile.am
+--- NetworkManager-0.8.996/network-manager-applet-0.8.996/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
++++ NetworkManager-0.8.996/network-manager-applet-0.8.996/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 +118,9 @@ diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/gnome-bluetoo
endif
EXTRA_DIST = $(BT_WIDGET_SOURCES)
-diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/Makefile.am.buildfix NetworkManager-0.8.995/network-manager-applet-0.8.995/src/Makefile.am
---- NetworkManager-0.8.995/network-manager-applet-0.8.995/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
-+++ NetworkManager-0.8.995/network-manager-applet-0.8.995/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.996/network-manager-applet-0.8.996/src/Makefile.am.buildfix NetworkManager-0.8.996/network-manager-applet-0.8.996/src/Makefile.am
+--- NetworkManager-0.8.996/network-manager-applet-0.8.996/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
++++ NetworkManager-0.8.996/network-manager-applet-0.8.996/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 +143,9 @@ diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/Makefile.am.b
uidir = $(datadir)/nm-applet
ui_DATA = applet.ui keyring.png
-diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/utils/Makefile.am.buildfix NetworkManager-0.8.995/network-manager-applet-0.8.995/src/utils/Makefile.am
---- NetworkManager-0.8.995/network-manager-applet-0.8.995/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.995/network-manager-applet-0.8.995/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.996/network-manager-applet-0.8.996/src/utils/Makefile.am.buildfix NetworkManager-0.8.996/network-manager-applet-0.8.996/src/utils/Makefile.am
+--- NetworkManager-0.8.996/network-manager-applet-0.8.996/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.996/network-manager-applet-0.8.996/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -1,5 +1,9 @@
SUBDIRS=. tests
@@ -132,17 +157,17 @@ diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/utils/Makefil
libutils_la_SOURCES = \
@@ -18,4 +22,7 @@ libutils_la_CPPFLAGS = \
- -I${top_srcdir}/src/gconf-helpers \
+ $(DISABLE_DEPRECATED) \
-I${top_srcdir}/src
- libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS)
-+libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS) \
+ libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS) $(GNOME_KEYRING_LIBS)
++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
+
-diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.995/network-manager-applet-0.8.995/src/utils/tests/Makefile.am
---- NetworkManager-0.8.995/network-manager-applet-0.8.995/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.995/network-manager-applet-0.8.995/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.996/network-manager-applet-0.8.996/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.996/network-manager-applet-0.8.996/src/utils/tests/Makefile.am
+--- NetworkManager-0.8.996/network-manager-applet-0.8.996/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.996/network-manager-applet-0.8.996/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 +177,9 @@ diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/utils/tests/M
noinst_PROGRAMS = test-utils
-diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.995/network-manager-applet-0.8.995/src/wireless-security/Makefile.am
---- NetworkManager-0.8.995/network-manager-applet-0.8.995/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.995/network-manager-applet-0.8.995/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
+diff -up NetworkManager-0.8.996/network-manager-applet-0.8.996/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.996/network-manager-applet-0.8.996/src/wireless-security/Makefile.am
+--- NetworkManager-0.8.996/network-manager-applet-0.8.996/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.996/network-manager-applet-0.8.996/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
@@ -1,5 +1,9 @@
noinst_LTLIBRARIES = libwireless-security.la
@@ -168,9 +193,9 @@ diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/wireless-secu
@@ -36,7 +40,9 @@ libwireless_security_la_CPPFLAGS = \
$(GTK_LIBS) \
$(NMA_LIBS) \
- ${top_builddir}/src/utils/libutils.la \
-- ${top_builddir}/src/gconf-helpers/libgconf-helpers.la
-+ ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
+ $(GCONF_LIBS) \
+- ${top_builddir}/src/utils/libutils.la
++ ${top_builddir}/src/utils/libutils.la \
+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
diff --git a/nm-applet-no-notifications.patch b/nm-applet-no-notifications.patch
index 6a10e49..3962ece 100644
--- a/nm-applet-no-notifications.patch
+++ b/nm-applet-no-notifications.patch
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/nm-applet.schemas.in.foo NetworkManager-0.8.995/network-manager-applet-0.8.995/nm-applet.schemas.in
---- NetworkManager-0.8.995/network-manager-applet-0.8.995/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
-+++ NetworkManager-0.8.995/network-manager-applet-0.8.995/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700
+diff -up NetworkManager-0.8.996/network-manager-applet-0.8.996/nm-applet.schemas.in.foo NetworkManager-0.8.996/network-manager-applet-0.8.996/nm-applet.schemas.in
+--- NetworkManager-0.8.996/network-manager-applet-0.8.996/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
++++ NetworkManager-0.8.996/network-manager-applet-0.8.996/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 193dfaa..e69de29 100644
--- a/sources
+++ b/sources
@@ -1,2 +0,0 @@
-1f86b6b0a35c125489d4cde2296766f6 NetworkManager-0.8.995.git20110308.tar.bz2
-516656d0858650dacacf8e3ea81e9097 network-manager-applet-0.8.995.git20110308.tar.bz2
More information about the scm-commits
mailing list