From e0aab189a81897251a2768634a330d767600a4bc Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 27 Apr 2011 19:07:05 -0500 Subject: [PATCH] Update from f15 --- NetworkManager.spec | 82 ++++++++++++++++++---------- nm-applet-internal-buildfixes.patch | 68 +++++++++++------------ nm-applet-no-notifications.patch | 6 +- nm-applet-wifi-dialog-ui-fixes.patch | 6 +- sources | 6 +- 5 files changed, 94 insertions(+), 74 deletions(-) diff --git a/NetworkManager.spec b/NetworkManager.spec index 1cb7c99..e8e2631 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -7,25 +7,20 @@ %define libnl_version 1.1 %define ppp_version 2.4.5 -%define snapshot .git20110328 -%define applet_snapshot .git20110328 -%define realversion 0.8.997 - -%define use_systemd 0 -%if 0%{?fedora} >= 15 -%define use_systemd 1 -%endif +%define snapshot .git20110427 +%define applet_snapshot .git20110427 +%define realversion 0.8.998 Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 -Version: 0.8.997 -Release: 5%{snapshot}%{?dist} +Version: 0.8.998 +Release: 4%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ -Source: %{name}-%{realversion}%{snapshot}.tar.bz2 +Source: %{name}-%{realversion}-compat%{snapshot}.tar.bz2 Source1: network-manager-applet-%{realversion}%{applet_snapshot}.tar.bz2 Source2: NetworkManager.conf Patch1: nm-applet-internal-buildfixes.patch @@ -37,11 +32,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): chkconfig Requires(preun): chkconfig -%if %{use_systemd} Requires(post): /bin/systemctl Requires(preun): /bin/systemctl Requires(postun): /bin/systemctl -%endif Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} @@ -69,7 +62,6 @@ BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: wireless-tools-devel >= %{wireless_tools_version} BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk3-devel >= %{gtk3_version} -BuildRequires: libglade2-devel BuildRequires: GConf2-devel BuildRequires: gnome-keyring-devel BuildRequires: gobject-introspection-devel >= 0.10.3 @@ -94,9 +86,7 @@ BuildRequires: desktop-file-utils %ifnarch s390 s390x BuildRequires: gnome-bluetooth-libs-devel >= 2.27.7.1-1 %endif -%if %{use_systemd} BuildRequires: systemd -%endif %description NetworkManager is a system network service that manages your network devices @@ -255,11 +245,6 @@ echo 'NotShowIn=KDE;' >>$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.de # validate the autostart .desktop file desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desktop -# remove systemd stuff if necessary -%if !%{use_systemd} -%{__rm} -f $RPM_BUILD_ROOT/lib/systemd/system/NetworkManager.service -%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service -%endif %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -270,10 +255,8 @@ if [ $1 == 1 ]; then /sbin/chkconfig --add NetworkManager /sbin/chkconfig NetworkManager resetpriorities -%if %{use_systemd} # Enable (but don't start) the units by default /bin/systemctl enable NetworkManager.service >/dev/null 2>&1 || : -%endif fi %preun @@ -282,25 +265,21 @@ if [ $1 -eq 0 ]; then killall -TERM nm-system-settings >/dev/null 2>&1 /sbin/chkconfig --del NetworkManager -%if %{use_systemd} # Disable and stop the units /bin/systemctl disable NetworkManager.service >/dev/null 2>&1 || : /bin/systemctl stop NetworkManager.service >/dev/null 2>&1 || : -%endif fi -%if %{use_systemd} %postun if [ $1 -ge 1 ] ; then # On upgrade, reload init system configuration if we changed unit files /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi -%triggerin -- NetworkManager < 1:0.8.1-5 +%triggerun -- NetworkManager < 1:0.8.990 if /sbin/chkconfig NetworkManager ; then /bin/systemctl enable NetworkManager.service >/dev/null 2>&1 || : fi -%endif %triggerun -- NetworkManager < 1:0.7.0-0.9.2.svn3614 /sbin/service NetworkManagerDispatcher stop >/dev/null 2>&1 @@ -378,10 +357,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/polkit-1/actions/*.policy /lib/udev/rules.d/*.rules # systemd stuff -%if %{use_systemd} /lib/systemd/system/NetworkManager.service +/lib/systemd/system/NetworkManager-wait-online.service %{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service -%endif %files devel %defattr(-,root,root,0755) @@ -441,7 +419,48 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Wed Apr 27 2011 Dan Williams - 0.8.998-4.git20110427 +- core: enable optimized background roaming for WPA Enterprise configs +- core: better handling of WiFi and WiMAX rfkill (rh #599002) +- applet: fix crash detecting Bluetooth DUN devices a second time +- ifcfg-rh: fix managed/unmanaged changes when removing connections (rh #698202) + +* Tue Apr 19 2011 Dan Williams - 0.8.998-3.git20110419 +- core: systemd and startup enhancements for NFS mounts +- core: more efficient startup process +- core: fix handling of multiple logins when one is inactive +- core: fix handling of S390/Hercules CTC network interfaces (rh #641986) +- core: support Easytether interfaces for Android phones +- core: fix handling of WWAN enable/disable states +- ifcfg-rh: harmonize handling if IPADDR/PREFIX/NETMASK with initscripts (rh #658907) +- applet: fix connection to WPA Enterprise networks (rh #694765) + +* Wed Apr 06 2011 Dan Williams - 0.8.998-2.git20110406 +- core: fix handling of infinite IPv6 RDNSS timeouts (rh #689291) + +* Mon Apr 04 2011 Dan Williams - 0.8.998-1 +- Update to 0.8.998 (0.9.0-rc1) +- core: fix near-infinite requests for passwords (rh #692783) +- core: fix handling of wired 802.1x connections +- core: ignore Nokia PC-Suite ethernet devices we can't use yet +- applet: migrate 0.8 OpenVPN passwords to 0.9 formats + +* Thu Mar 31 2011 Dan Williams - 0.8.997-8.git20110331 +- core: resurrect default VPN username +- core: don't stomp on crypto library users by de-initing the crypto library + +* Wed Mar 30 2011 Dan Williams - 0.8.997-7.git20110330 +- core: fix creation of default wired connections +- core: fix requesting new secrets when old ones fail (ex changing WEP keys) +- editor: ensure all pages are sensitive after retrieving secrets +- editor: fix crash when scrolling through connection lists (rh #693446) +- applet: fix crash after using the wifi or wired secrets dialogs (rh #693446) + +* Mon Mar 28 2011 Christopher Aillon - 0.8.997-6.git20110328 +- Fix trigger to enable the systemd service for upgrades (rh #678553) + * Mon Mar 28 2011 Dan Williams - 0.8.997-5.git20110328 +- core: fix connection deactivation on the compat interface - core: give default wired connections a more friendly name - core: fix base type of newly created wired connections - applet: many updated translations @@ -453,6 +472,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Thu Mar 24 2011 Dan Williams - 0.8.997-3.git20110324 - nm-version.h should be in NetworkManager-devel, not -glib-devel (rh #685442) +* Thu Mar 24 2011 Dan Williams - 0.8.997-2.git20110324 +- core: add compatibility layer for KDE Plasma network infrastructure + * Mon Mar 21 2011 Dan Williams - 0.8.997-1 - Update to 0.8.997 (0.9-beta3) - ifcfg-rh: fix reading and writing of Dynamic WEP connections using LEAP as the eap method diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch index 9d06fe0..c6c59f4 100644 --- a/nm-applet-internal-buildfixes.patch +++ b/nm-applet-internal-buildfixes.patch @@ -1,14 +1,14 @@ -diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/configure.ac.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/configure.ac ---- NetworkManager-0.8.997/network-manager-applet-0.8.997/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400 -+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/configure.ac 2009-07-28 13:11:39.261718877 -0400 +diff -up NetworkManager-0.8.998/network-manager-applet-0.8.998/configure.ac.buildfix NetworkManager-0.8.998/network-manager-applet-0.8.998/configure.ac +--- NetworkManager-0.8.998/network-manager-applet-0.8.998/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400 ++++ NetworkManager-0.8.998/network-manager-applet-0.8.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 glib-2.0 >= 2.16 -- NetworkManager >= 0.8.996 -- libnm-glib >= 0.8.996 -- libnm-util >= 0.8.996 -- libnm-glib-vpn >= 0.8.996 +- NetworkManager >= 0.8.998 +- libnm-glib >= 0.8.998 +- libnm-util >= 0.8.998 +- libnm-glib-vpn >= 0.8.998 gmodule-export-2.0]) PKG_CHECK_MODULES(GCONF, [gconf-2.0]) @@ -17,16 +17,16 @@ diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/configure.ac.buil AC_MSG_CHECKING(for gnome-bluetooth) PKG_CHECK_MODULES(GNOME_BLUETOOTH, - gnome-bluetooth-1.0 >= 2.27.6 -- libnm-util >= 0.8.995 -- libnm-glib >= 0.8.995, +- libnm-util >= 0.8.998 +- libnm-glib >= 0.8.998, + gnome-bluetooth-1.0 >= 2.27.6, have_gbt=yes, have_gbt=no) ;; esac -diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/connection-editor/Makefile.am ---- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400 -+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400 +diff -up NetworkManager-0.8.998/network-manager-applet-0.8.998/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.998/network-manager-applet-0.8.998/src/connection-editor/Makefile.am +--- NetworkManager-0.8.998/network-manager-applet-0.8.998/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400 ++++ NetworkManager-0.8.998/network-manager-applet-0.8.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.997/network-manager-applet-0.8.997/src/connection-ed uidir = $(datadir)/nm-applet ui_DATA = \ -diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/Makefile.am ---- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400 -+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +diff -up NetworkManager-0.8.998/network-manager-applet-0.8.998/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.998/network-manager-applet-0.8.998/src/gconf-helpers/Makefile.am +--- NetworkManager-0.8.998/network-manager-applet-0.8.998/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400 ++++ NetworkManager-0.8.998/network-manager-applet-0.8.998/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.8.997/network-manager-applet-0.8.997/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.8.997/network-manager-applet-0.8.997/src/gconf-helpers/tests/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/tests/Makefile.am ---- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/tests/Makefile.am.buildfix 2011-03-10 02:19:03.664936744 -0600 -+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/tests/Makefile.am 2011-03-10 02:20:10.784097638 -0600 +diff -up NetworkManager-0.8.998/network-manager-applet-0.8.998/src/gconf-helpers/tests/Makefile.am.buildfix NetworkManager-0.8.998/network-manager-applet-0.8.998/src/gconf-helpers/tests/Makefile.am +--- NetworkManager-0.8.998/network-manager-applet-0.8.998/src/gconf-helpers/tests/Makefile.am.buildfix 2011-03-10 02:19:03.664936744 -0600 ++++ NetworkManager-0.8.998/network-manager-applet-0.8.998/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.8.997/network-manager-applet-0.8.997/src/gconf-helpers noinst_PROGRAMS = test-upgrade -diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gnome-bluetooth/Makefile.am ---- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400 -+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400 +diff -up NetworkManager-0.8.998/network-manager-applet-0.8.998/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.998/network-manager-applet-0.8.998/src/gnome-bluetooth/Makefile.am +--- NetworkManager-0.8.998/network-manager-applet-0.8.998/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400 ++++ NetworkManager-0.8.998/network-manager-applet-0.8.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 \ @@ -118,9 +118,9 @@ diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gnome-bluetoo endif EXTRA_DIST = $(BT_WIDGET_SOURCES) -diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/Makefile.am ---- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400 -+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +diff -up NetworkManager-0.8.998/network-manager-applet-0.8.998/src/Makefile.am.buildfix NetworkManager-0.8.998/network-manager-applet-0.8.998/src/Makefile.am +--- NetworkManager-0.8.998/network-manager-applet-0.8.998/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400 ++++ NetworkManager-0.8.998/network-manager-applet-0.8.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 @@ -142,10 +142,10 @@ diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/Makefile.am.b + -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la uidir = $(datadir)/nm-applet - ui_DATA = applet.ui keyring.png -diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/Makefile.am ---- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 -+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400 + ui_DATA = gsm-unlock.ui info.ui wired-8021x.ui wifi.ui keyring.png +diff -up NetworkManager-0.8.998/network-manager-applet-0.8.998/src/utils/Makefile.am.buildfix NetworkManager-0.8.998/network-manager-applet-0.8.998/src/utils/Makefile.am +--- NetworkManager-0.8.998/network-manager-applet-0.8.998/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 ++++ NetworkManager-0.8.998/network-manager-applet-0.8.998/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.8.997/network-manager-applet-0.8.997/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.8.997/network-manager-applet-0.8.997/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/tests/Makefile.am ---- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 -+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +diff -up NetworkManager-0.8.998/network-manager-applet-0.8.998/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.998/network-manager-applet-0.8.998/src/utils/tests/Makefile.am +--- NetworkManager-0.8.998/network-manager-applet-0.8.998/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 ++++ NetworkManager-0.8.998/network-manager-applet-0.8.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 \ @@ -177,9 +177,9 @@ diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/tests/M noinst_PROGRAMS = test-utils -diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/wireless-security/Makefile.am ---- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 -+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400 +diff -up NetworkManager-0.8.998/network-manager-applet-0.8.998/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.998/network-manager-applet-0.8.998/src/wireless-security/Makefile.am +--- NetworkManager-0.8.998/network-manager-applet-0.8.998/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 ++++ NetworkManager-0.8.998/network-manager-applet-0.8.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 0b00758..91af98e 100644 --- a/nm-applet-no-notifications.patch +++ b/nm-applet-no-notifications.patch @@ -1,6 +1,6 @@ -diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/nm-applet.schemas.in.foo NetworkManager-0.8.997/network-manager-applet-0.8.997/nm-applet.schemas.in ---- NetworkManager-0.8.997/network-manager-applet-0.8.997/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700 -+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700 +diff -up NetworkManager-0.8.998/network-manager-applet-0.8.998/nm-applet.schemas.in.foo NetworkManager-0.8.998/network-manager-applet-0.8.998/nm-applet.schemas.in +--- NetworkManager-0.8.998/network-manager-applet-0.8.998/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700 ++++ NetworkManager-0.8.998/network-manager-applet-0.8.998/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700 @@ -6,7 +6,7 @@ /apps/nm-applet/disable-connected-notifications nm-applet diff --git a/nm-applet-wifi-dialog-ui-fixes.patch b/nm-applet-wifi-dialog-ui-fixes.patch index d0d29eb..1b30ad2 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.8.997/network-manager-applet-0.8.997/src/wireless-dialog.c NetworkManager-0.8.997/network-manager-applet-0.8.997/src/wireless-dialog.c +diff --git NetworkManager-0.8.998/network-manager-applet-0.8.998/src/wireless-dialog.c NetworkManager-0.8.998/network-manager-applet-0.8.998/src/wireless-dialog.c index 2cd75e0..5ae4764 100644 ---- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/wireless-dialog.c -+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/wireless-dialog.c +--- NetworkManager-0.8.998/network-manager-applet-0.8.998/src/wireless-dialog.c ++++ NetworkManager-0.8.998/network-manager-applet-0.8.998/src/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 97a6458..00012dc 100644 --- a/sources +++ b/sources @@ -1,4 +1,2 @@ -f3d71b74104ea14bb7f58a8cb0c7d312 network-manager-applet-0.8.997.git20110325.tar.bz2 -58cacb86a5d7b0d5be0297212c2cd842 NetworkManager-0.8.997.git20110325.tar.bz2 -848da21ae25223ef0d991e939a676dc5 NetworkManager-0.8.997.git20110328.tar.bz2 -bf62f50f5beba2bea863ae70b06e1327 network-manager-applet-0.8.997.git20110328.tar.bz2 +7d881e5646c389e3ffe3d193a9f4045c NetworkManager-0.8.998-compat.git20110427.tar.bz2 +9704c43180c23c9398ce0882de2475b1 network-manager-applet-0.8.998.git20110427.tar.bz2