[NetworkManager/f16] Updated to 0.9.4
Jirka Klimes
jklimes at fedoraproject.org
Wed Mar 28 11:22:08 UTC 2012
commit a95c3343b83d3bbea1fc8ba5221765036c5a45bd
Author: Jiří Klimeš <jklimes at redhat.com>
Date: Wed Mar 28 11:50:34 2012 +0200
Updated to 0.9.4
.gitignore | 2 +
NetworkManager.spec | 20 +++++++---
applet-ignore-deprecated.patch | 16 ++++----
nm-applet-internal-buildfixes.patch | 72 +++++++++++++++++-----------------
nm-applet-no-notifications.patch | 6 +-
nm-applet-wifi-dialog-ui-fixes.patch | 6 +-
sources | 4 +-
7 files changed, 68 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 99c57a1..08b3a11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -263,3 +263,5 @@ network-manager-applet-0.8.1.tar.bz2
/network-manager-applet-0.9.1.90.tar.bz2
/NetworkManager-0.9.1.90.git20110927.tar.bz2
/network-manager-applet-0.9.1.90.git20110927.tar.bz2
+/NetworkManager-0.9.4.0.git20120328.tar.bz2
+/network-manager-applet-0.9.4.0.git20120328.tar.bz2
diff --git a/NetworkManager.spec b/NetworkManager.spec
index d04bc0e..ef4b2b3 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,14 +7,14 @@
%define libnl_version 1.1
%define ppp_version 2.4.5
-%define snapshot %{nil}
-%define applet_snapshot %{nil}
-%define realversion 0.9.2.0
+%define snapshot .git20120328
+%define applet_snapshot .git20120328
+%define realversion 0.9.4.0
Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
-Version: 0.9.2
+Version: 0.9.4
Release: 1%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
@@ -91,7 +91,11 @@ BuildRequires: desktop-file-utils
%ifnarch s390 s390x
BuildRequires: gnome-bluetooth-libs-devel >= 2.27.7.1-1
%endif
-BuildRequires: systemd
+BuildRequires: systemd systemd-devel
+%if 0%{?fedora} < 17
+# systemd.pc is in systemd-units for F16 and below
+BuildRequires: systemd-units
+%endif
BuildRequires: iso-codes-devel
%description
@@ -352,7 +356,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang
%defattr(-,root,root,0755)
%doc COPYING NEWS AUTHORS README CONTRIBUTING TODO
-%{_sysconfdir}/dbus-1/system.d/NetworkManager.conf
+%{_sysconfdir}/dbus-1/system.d/org.freedesktop.NetworkManager.conf
%{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf
%{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf
%{_sysconfdir}/dbus-1/system.d/nm-dispatcher.conf
@@ -431,6 +435,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/libnm-glib/*.h
%{_includedir}/%{name}/nm-setting*.h
%{_includedir}/%{name}/nm-connection.h
+%{_includedir}/%{name}/nm-utils-enum-types.h
%{_includedir}/%{name}/nm-utils.h
%{_libdir}/pkgconfig/libnm-glib.pc
%{_libdir}/pkgconfig/libnm-glib-vpn.pc
@@ -459,6 +464,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/libnm-gtk.so
%changelog
+* Wed Mar 28 2012 Jiří Klimeš <jklimes at redhat.com> - 0.9.4.0-1.git20120328
+- Update to 0.9.4
+
* Thu Nov 09 2011 Dan Williams <dcbw at redhat.com> - 0.9.2-1
- core: fix possible crash when talking to ModemManager
- core: improve handling of rfkill on some machines (eeepc 1005HA and others)
diff --git a/applet-ignore-deprecated.patch b/applet-ignore-deprecated.patch
index 7b3cd6d..dbe8f64 100644
--- a/applet-ignore-deprecated.patch
+++ b/applet-ignore-deprecated.patch
@@ -1,18 +1,18 @@
-diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/m4/compiler_warnings.m4.depre NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/m4/compiler_warnings.m4
---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/m4/compiler_warnings.m4.depre 2011-11-10 15:03:07.528830185 -0600
-+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/m4/compiler_warnings.m4 2011-11-10 15:05:28.273070638 -0600
+diff -up NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/m4/compiler_warnings.m4.depre NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/m4/compiler_warnings.m4
+--- NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/m4/compiler_warnings.m4.depre 2011-11-10 15:03:07.528830185 -0600
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/m4/compiler_warnings.m4 2011-11-10 15:05:28.273070638 -0600
@@ -7,7 +7,7 @@ if test "$GCC" = "yes" -a "$set_more_war
AC_MSG_RESULT(yes)
- CFLAGS="-Wall -Werror -std=gnu89 $CFLAGS"
+ CFLAGS="-Wall -std=gnu89 $CFLAGS"
- for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \
+ for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes -Wno-deprecated-declarations -Wno-error=deprecated-declarations \
-Wdeclaration-after-statement -Wstrict-prototypes \
-Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \
- -fno-strict-aliasing; do
-diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac.foo NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac
---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac.foo 2011-11-10 15:10:45.268107655 -0600
-+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac 2011-11-10 15:10:51.902024720 -0600
+ -fno-strict-aliasing -Wno-unused-but-set-variable; do
+diff -up NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/configure.ac.foo NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/configure.ac
+--- NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/configure.ac.foo 2011-11-10 15:10:45.268107655 -0600
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/configure.ac 2011-11-10 15:10:51.902024720 -0600
@@ -179,8 +179,6 @@ dnl
dnl Compiler flags
dnl
diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch
index ad1d14c..1139654 100644
--- a/nm-applet-internal-buildfixes.patch
+++ b/nm-applet-internal-buildfixes.patch
@@ -1,14 +1,14 @@
-diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac
---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
-+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac 2009-07-28 13:11:39.261718877 -0400
+diff -up NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/configure.ac.buildfix NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/configure.ac
+--- NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/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.9.2
-- libnm-glib >= 0.9.2
-- libnm-util >= 0.9.2
-- libnm-glib-vpn >= 0.9.2
+- NetworkManager >= 0.9.4
+- libnm-glib >= 0.9.4
+- libnm-util >= 0.9.4
+- libnm-glib-vpn >= 0.9.4
gmodule-export-2.0])
PKG_CHECK_MODULES(GCONF, [gconf-2.0])
@@ -17,16 +17,16 @@ diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac.buil
AC_MSG_CHECKING(for gnome-bluetooth)
PKG_CHECK_MODULES(GNOME_BLUETOOTH,
- gnome-bluetooth-1.0 >= 2.27.6
-- libnm-util >= 0.9.2
-- libnm-glib >= 0.9.2,
+- libnm-util >= 0.9.4
+- libnm-glib >= 0.9.4,
+ gnome-bluetooth-1.0 >= 2.27.6,
have_gbt=yes, have_gbt=no)
;;
esac
-diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am
---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
-+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400
+diff -up NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/connection-editor/Makefile.am
+--- NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/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.9.2.0/network-manager-applet-0.9.2.0/src/connection-ed
uidir = $(datadir)/nm-applet
ui_DATA = \
-diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am
---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
-+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/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.9.2.0/network-manager-applet-0.9.2.0/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.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am
---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am.buildfix 2011-03-10 02:19:03.664936744 -0600
-+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am 2011-03-10 02:20:10.784097638 -0600
+diff -up NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/gconf-helpers/tests/Makefile.am.buildfix NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/gconf-helpers/tests/Makefile.am
+--- NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/gconf-helpers/tests/Makefile.am.buildfix 2011-03-10 02:19:03.664936744 -0600
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/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.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers
noinst_PROGRAMS = test-upgrade
-diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am
---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
-+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
+diff -up NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/gnome-bluetooth/Makefile.am
+--- NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
@@ -6,6 +6,9 @@ INCLUDES = \
-I${top_builddir}/src/marshallers \
-I${top_srcdir}/src/utils \
@@ -118,9 +118,9 @@ diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetoo
endif
EXTRA_DIST = $(BT_WIDGET_SOURCES)
-diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am
---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
-+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/Makefile.am.buildfix NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/Makefile.am
+--- NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/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.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am.b
uidir = $(datadir)/nm-applet
ui_DATA = gsm-unlock.ui info.ui wired-8021x.ui keyring.png
-diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/Makefile.am
---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/utils/Makefile.am.buildfix NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/utils/Makefile.am
+--- NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/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.9.2.0/network-manager-applet-0.9.2.0/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.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am
---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/utils/tests/Makefile.am.buildfix NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/utils/tests/Makefile.am
+--- NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/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.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/M
noinst_PROGRAMS = test-utils
-diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am
---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
+diff -up NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/wireless-security/Makefile.am
+--- NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
@@ -1,5 +1,9 @@
noinst_LTLIBRARIES = libwireless-security.la
@@ -202,9 +202,9 @@ diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-secu
uidir = $(datadir)/nm-applet
ui_DATA = \
-diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am.blah NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am
---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am.blah 2011-09-19 23:44:41.648498871 -0500
-+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am 2011-09-19 23:45:26.556937440 -0500
+diff -up NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/libnm-gtk/Makefile.am.blah NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/libnm-gtk/Makefile.am
+--- NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/libnm-gtk/Makefile.am.blah 2011-09-19 23:44:41.648498871 -0500
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/libnm-gtk/Makefile.am 2011-09-19 23:45:26.556937440 -0500
@@ -1,3 +1,7 @@
+INCLUDES = -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \
diff --git a/nm-applet-no-notifications.patch b/nm-applet-no-notifications.patch
index d86b5e9..a76cd6e 100644
--- a/nm-applet-no-notifications.patch
+++ b/nm-applet-no-notifications.patch
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/nm-applet.schemas.in.foo NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/nm-applet.schemas.in
---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
-+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700
+diff -up NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/nm-applet.schemas.in.foo NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/nm-applet.schemas.in
+--- NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/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 2b3a118..816e7bc 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.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/nm-wireless-dialog.c NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/nm-wireless-dialog.c
+diff --git NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/libnm-gtk/nm-wireless-dialog.c NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/libnm-gtk/nm-wireless-dialog.c
index 2cd75e0..5ae4764 100644
---- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/nm-wireless-dialog.c
-+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/nm-wireless-dialog.c
+--- NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/libnm-gtk/nm-wireless-dialog.c
++++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/libnm-gtk/nm-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 1f37bbf..522360b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-bc0b00b8a187762d93c50a9706b4c5c3 NetworkManager-0.9.2.0.tar.bz2
-feaf2c8427d23924dde7de52ff4c5078 network-manager-applet-0.9.2.0.tar.bz2
+019977d861ff17aa7a51a5393ef8d218 NetworkManager-0.9.4.0.git20120328.tar.bz2
+042b3c02f087e44d9ca11ed7a2172a41 network-manager-applet-0.9.4.0.git20120328.tar.bz2
More information about the scm-commits
mailing list