[NetworkManager/f17] Update to 0.9.6.4
Jirka Klimes
jklimes at fedoraproject.org
Tue Oct 30 17:01:16 UTC 2012
commit 502959d1a3b2b33fa8433349cb29fa027ca75ba9
Author: Jiří Klimeš <jklimes at redhat.com>
Date: Tue Oct 30 15:18:05 2012 +0100
Update to 0.9.6.4
.gitignore | 2 +
NetworkManager.spec | 30 ++++++-----
applet-ignore-deprecated.patch | 6 +-
nm-applet-internal-buildfixes.patch | 94 +++++++++++++++++++---------------
nm-applet-no-notifications.patch | 56 +++++++++-----------
nm-applet-wifi-dialog-ui-fixes.patch | 8 +--
sources | 4 +-
7 files changed, 105 insertions(+), 95 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6ed8f5d..f72a39b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -288,3 +288,5 @@ network-manager-applet-0.8.1.tar.bz2
/NetworkManager-0.9.4.0.git20120521.tar.bz2
/network-manager-applet-0.9.4.1.git20120521.tar.bz2
/network-manager-applet-0.9.4.0.git20120521.tar.bz2
+/NetworkManager-0.9.6.4.tar.xz
+/network-manager-applet-0.9.6.4.tar.xz
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 923b546..a7e5d9a 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,9 +7,9 @@
%define libnl3_version 3.2.6
%define ppp_version 2.4.5
-%define snapshot .git20120521
-%define applet_snapshot .git20120521
-%define realversion 0.9.4.0
+%define snapshot %{nil}
+%define applet_snapshot %{nil}
+%define realversion 0.9.6.4
%if 0%{?fedora} && 0%{?fedora} < 17
%define systemd_dir /lib/systemd/system
@@ -20,14 +20,14 @@
Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
-Version: 0.9.4.0
-Release: 9%{snapshot}%{?dist}
+Version: 0.9.6.4
+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-%{realversion}%{applet_snapshot}.tar.bz2
+Source: %{name}-%{realversion}%{snapshot}.tar.xz
+Source1: network-manager-applet-%{realversion}%{applet_snapshot}.tar.xz
Source2: NetworkManager.conf
Patch1: nm-applet-internal-buildfixes.patch
Patch2: explain-dns1-dns2.patch
@@ -209,7 +209,7 @@ nm-applet and the GNOME control center.
%setup -q -n NetworkManager-%{realversion}
# unpack the applet and nmcli
-tar -xjf %{SOURCE1}
+tar -xJf %{SOURCE1}
%patch1 -p1 -b .buildfix
%patch2 -p1 -b .explain-dns1-dns2
@@ -369,19 +369,18 @@ fi
%post gnome
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
- gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
-fi
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%postun gnome
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%posttrans gnome
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%files -f %{name}.lang
%defattr(-,root,root,0755)
@@ -443,6 +442,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files gnome
%defattr(-,root,root,0755)
%{_bindir}/nm-applet
+%{_libexecdir}/nm-applet-migration-tool
%{_bindir}/nm-connection-editor
%{_datadir}/applications/*.desktop
%{_datadir}/nm-applet/
@@ -453,7 +453,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/icons/hicolor/scalable/apps/*.svg
%{_sysconfdir}/xdg/autostart/nm-applet.desktop
%dir %{_datadir}/gnome-vpn-properties
-%{_sysconfdir}/gconf/schemas/nm-applet.schemas
+%{_datadir}/GConf/gsettings/nm-applet.convert
+%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
%ifnarch s390 s390x
%{_libdir}/gnome-bluetooth/plugins/*
%endif
@@ -501,6 +502,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/libnm-gtk.so
%changelog
+* Tue Oct 30 2012 Jiří Klimeš <jklimes at redhat.com> - 0.9.6.4-1
+- Updated to stable upstream release 0.9.6.4
+
* Mon May 21 2012 Jiří Klimeš <jklimes at redhat.com> - 0.9.4.0-9.git20120521
- Update to git snapshot
- nmcli: show progress for longer operations in --pretty mode
diff --git a/applet-ignore-deprecated.patch b/applet-ignore-deprecated.patch
index e9495a4..80eab42 100644
--- a/applet-ignore-deprecated.patch
+++ b/applet-ignore-deprecated.patch
@@ -1,6 +1,6 @@
-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
+diff -up NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/configure.ac.foo NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/configure.ac
+--- NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/configure.ac.foo 2011-11-10 15:10:45.268107655 -0600
++++ NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/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 d55bed8..2f9acff 100644
--- a/nm-applet-internal-buildfixes.patch
+++ b/nm-applet-internal-buildfixes.patch
@@ -1,15 +1,15 @@
-Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/configure.ac
+Index: NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/configure.ac
===================================================================
---- NetworkManager-0.9.4.0.orig/network-manager-applet-0.9.4.0/configure.ac
-+++ NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/configure.ac
+--- NetworkManager-0.9.6.4.orig/network-manager-applet-0.9.6.4/configure.ac
++++ NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/configure.ac
@@ -98,10 +98,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.4
-- libnm-glib >= 0.9.4
-- libnm-util >= 0.9.4
-- libnm-glib-vpn >= 0.9.4
+ gio-2.0 >= 2.26
+- NetworkManager >= 0.9.6
+- libnm-glib >= 0.9.6
+- libnm-util >= 0.9.6
+- libnm-glib-vpn >= 0.9.6
gmodule-export-2.0])
# With recent glib, defining GLIB_VERSION_MIN_REQUIRED avoids
@@ -23,10 +23,10 @@ Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/configure.ac
have_gbt=yes, have_gbt=no)
;;
esac
-Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/connection-editor/Makefile.am
+Index: NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/src/connection-editor/Makefile.am
===================================================================
---- NetworkManager-0.9.4.0.orig/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
+--- NetworkManager-0.9.6.4.orig/network-manager-applet-0.9.6.4/src/connection-editor/Makefile.am
++++ NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/src/connection-editor/Makefile.am
@@ -1,5 +1,9 @@
bin_PROGRAMS = nm-connection-editor
@@ -49,10 +49,10 @@ Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/connection-edit
uidir = $(datadir)/nm-applet
ui_DATA = \
-Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/gconf-helpers/Makefile.am
+Index: NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/src/gconf-helpers/Makefile.am
===================================================================
---- NetworkManager-0.9.4.0.orig/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
+--- NetworkManager-0.9.6.4.orig/network-manager-applet-0.9.6.4/src/gconf-helpers/Makefile.am
++++ NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/src/gconf-helpers/Makefile.am
@@ -1,5 +1,9 @@
SUBDIRS=. tests
@@ -83,10 +83,10 @@ Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/gconf-helpers/M
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
-Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/gconf-helpers/tests/Makefile.am
+Index: NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/src/gconf-helpers/tests/Makefile.am
===================================================================
---- NetworkManager-0.9.4.0.orig/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
+--- NetworkManager-0.9.6.4.orig/network-manager-applet-0.9.6.4/src/gconf-helpers/tests/Makefile.am
++++ NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/src/gconf-helpers/tests/Makefile.am
@@ -1,4 +1,7 @@
-INCLUDES = -I$(top_srcdir)/src/utils
+INCLUDES = -I$(top_srcdir)/src/utils \
@@ -96,10 +96,11 @@ Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/gconf-helpers/t
noinst_PROGRAMS = test-upgrade
-Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/gnome-bluetooth/Makefile.am
+
+Index: NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/src/gnome-bluetooth/Makefile.am
===================================================================
---- NetworkManager-0.9.4.0.orig/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
+--- NetworkManager-0.9.6.4.orig/network-manager-applet-0.9.6.4/src/gnome-bluetooth/Makefile.am
++++ NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/src/gnome-bluetooth/Makefile.am
@@ -6,6 +6,9 @@ INCLUDES = \
-I${top_builddir}/src/marshallers \
-I${top_srcdir}/src/utils \
@@ -121,10 +122,10 @@ Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/gnome-bluetooth
endif
EXTRA_DIST = $(BT_WIDGET_SOURCES)
-Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/Makefile.am
+Index: NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/src/Makefile.am
===================================================================
---- NetworkManager-0.9.4.0.orig/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
+--- NetworkManager-0.9.6.4.orig/network-manager-applet-0.9.6.4/src/Makefile.am
++++ NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/src/Makefile.am
@@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
bin_PROGRAMS = nm-applet
@@ -137,20 +138,20 @@ Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/Makefile.am
$(GTK_CFLAGS) \
$(NMA_CFLAGS) \
@@ -72,7 +76,9 @@ nm_applet_LDADD = \
+ ${top_builddir}/src/marshallers/libmarshallers.la \
${top_builddir}/src/utils/libutils.la \
- ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
${top_builddir}/src/wireless-security/libwireless-security.la \
- ${top_builddir}/src/libnm-gtk/libnm-gtk.la
+ ${top_builddir}/src/libnm-gtk/libnm-gtk.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
-
- uidir = $(datadir)/nm-applet
- ui_DATA = gsm-unlock.ui info.ui wired-8021x.ui keyring.png
-Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/utils/Makefile.am
+
+
+ if BUILD_MIGRATION_TOOL
+Index: NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/src/utils/Makefile.am
===================================================================
---- NetworkManager-0.9.4.0.orig/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
+--- NetworkManager-0.9.6.4.orig/network-manager-applet-0.9.6.4/src/utils/Makefile.am
++++ NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/src/utils/Makefile.am
@@ -1,5 +1,9 @@
SUBDIRS=. tests
@@ -164,14 +165,14 @@ Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/utils/Makefile.
@@ -17,3 +21,6 @@ libutils_la_CPPFLAGS = \
-I${top_srcdir}/src
- libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS) $(GNOME_KEYRING_LIBS)
-+libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS) $(GNOME_KEYRING_LIBS) \
+ libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS)
++libutils_la_LIBADD = $(GTK_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
-Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/utils/tests/Makefile.am
+Index: NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/src/utils/tests/Makefile.am
===================================================================
---- NetworkManager-0.9.4.0.orig/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
+--- NetworkManager-0.9.6.4.orig/network-manager-applet-0.9.6.4/src/utils/tests/Makefile.am
++++ NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/src/utils/tests/Makefile.am
@@ -1,4 +1,7 @@
-INCLUDES = -I$(top_srcdir)/src/utils
+INCLUDES = -I$(top_srcdir)/src/utils \
@@ -181,10 +182,19 @@ Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/utils/tests/Mak
noinst_PROGRAMS = test-utils
-Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/wireless-security/Makefile.am
+@@ -14,6 +14,8 @@
+
+ test_utils_LDADD = \
+ ${top_builddir}/src/utils/libutils.la \
++ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la \
+ $(GTK_LIBS) \
+ $(NMA_LIBS) \
+ $(GNOME_KEYRING_LIBS)
+Index: NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/src/wireless-security/Makefile.am
===================================================================
---- NetworkManager-0.9.4.0.orig/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
+--- NetworkManager-0.9.6.4.orig/network-manager-applet-0.9.6.4/src/wireless-security/Makefile.am
++++ NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/src/wireless-security/Makefile.am
@@ -1,5 +1,9 @@
noinst_LTLIBRARIES = libwireless-security.la
@@ -196,9 +206,9 @@ Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/wireless-securi
wireless-security.h \
wireless-security.c \
@@ -40,7 +44,9 @@ libwireless_security_la_LIBADD = \
+ libwireless_security_la_LIBADD = \
$(GTK_LIBS) \
$(NMA_LIBS) \
- $(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 \
@@ -206,10 +216,10 @@ Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/wireless-securi
uidir = $(datadir)/nm-applet
ui_DATA = \
-Index: NetworkManager-0.9.4.0/network-manager-applet-0.9.4.0/src/libnm-gtk/Makefile.am
+Index: NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/src/libnm-gtk/Makefile.am
===================================================================
---- NetworkManager-0.9.4.0.orig/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
+--- NetworkManager-0.9.6.4.orig/network-manager-applet-0.9.6.4/src/libnm-gtk/Makefile.am
++++ NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/src/libnm-gtk/Makefile.am
@@ -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 a76cd6e..0fc7a59 100644
--- a/nm-applet-no-notifications.patch
+++ b/nm-applet-no-notifications.patch
@@ -1,30 +1,26 @@
-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>
- <type>bool</type>
-- <default>FALSE</default>
-+ <default>TRUE</default>
- <locale name="C">
- <short>Disable connected notifications</short>
- <long>
-@@ -20,7 +20,7 @@
- <applyto>/apps/nm-applet/disable-disconnected-notifications</applyto>
- <owner>nm-applet</owner>
- <type>bool</type>
-- <default>FALSE</default>
-+ <default>TRUE</default>
- <locale name="C">
- <short>Disable disconnected notifications</short>
- <long>
-@@ -34,7 +34,7 @@
- <applyto>/apps/nm-applet/suppress-wireless-networks-available</applyto>
- <owner>nm-applet</owner>
- <type>bool</type>
-- <default>FALSE</default>
-+ <default>TRUE</default>
- <locale name="C">
- <short>Suppress networks available notifications</short>
- <long>
+--- NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/org.gnome.nm-applet.gschema.xml.in
++++ NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/org.gnome.nm-applet.gschema.xml.in
+@@ -2,12 +2,12 @@
+ <schemalist gettext-domain="nm-applet">
+ <schema id="org.gnome.nm-applet" path="/org/gnome/nm-applet/">
+ <key name="disable-connected-notifications" type="b">
+- <default>false</default>
++ <default>true</default>
+ <_summary>Disable connected notifications</_summary>
+ <_description>Set this to true to disable notifications when connecting to a network.</_description>
+ </key>
+ <key name="disable-disconnected-notifications" type="b">
+- <default>false</default>
++ <default>true</default>
+ <_summary>Disable disconnected notifications</_summary>
+ <_description>Set this to true to disable notifications when disconnecting from a network.</_description>
+ </key>
+@@ -17,7 +17,7 @@
+ <_description>Set this to true to disable notifications when connecting to or disconnecting from a VPN.</_description>
+ </key>
+ <key name="suppress-wireless-networks-available" type="b">
+- <default>false</default>
++ <default>true</default>
+ <_summary>Suppress networks available notifications</_summary>
+ <_description>Set this to true to disable notifications when wireless networks are available.</_description>
+ </key>
diff --git a/nm-applet-wifi-dialog-ui-fixes.patch b/nm-applet-wifi-dialog-ui-fixes.patch
index 816e7bc..213e0de 100644
--- a/nm-applet-wifi-dialog-ui-fixes.patch
+++ b/nm-applet-wifi-dialog-ui-fixes.patch
@@ -1,8 +1,6 @@
-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.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,
+--- NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/src/libnm-gtk/nm-wifi-dialog.c.applet-wifi-ui 2012-08-14 08:59:42.000000000 -0400
++++ NetworkManager-0.9.6.4/network-manager-applet-0.9.6.4/src/libnm-gtk/nm-wifi-dialog.c 2012-08-20 14:17:10.059729528 -0400
+@@ -1140,24 +1140,28 @@
tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the wireless network '%s'."),
esc_ssid ? esc_ssid : "<unknown>");
diff --git a/sources b/sources
index 61d7206..4e407bf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-dae8559d7472eb6feef7109f9d670d8e NetworkManager-0.9.4.0.git20120521.tar.bz2
-4bdb87c7c9049308e9182db381818eda network-manager-applet-0.9.4.0.git20120521.tar.bz2
+54ca5200edeb5155086ced43d00b0cad NetworkManager-0.9.6.4.tar.xz
+8750d83a1151f5f9b0edd2ffcd4e8fc6 network-manager-applet-0.9.6.4.tar.xz
More information about the scm-commits
mailing list