From 3f87941fab6351f0e80b99ed1470f36bb322e846 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Feb 25 2009 20:38:29 +0000 Subject: - Fix getting secrets for system connections (rh #486696) - More compatible modem autodetection - Better handle minimal ifcfg files --- diff --git a/.cvsignore b/.cvsignore index 8c74734..a79f651 100644 --- a/.cvsignore +++ b/.cvsignore @@ -137,3 +137,5 @@ network-manager-applet-0.7.0.97.tar.gz NetworkManager-0.7.0.97.git20090219.tar.gz network-manager-applet-0.7.0.97.svn1189.tar.gz NetworkManager-0.7.0.97.git20090220.tar.gz +NetworkManager-0.7.0.98.git20090225.tar.bz2 +network-manager-applet-0.7.0.98.svn1202.tar.bz2 diff --git a/NetworkManager.spec b/NetworkManager.spec index df009e2..852fc9c 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -11,20 +11,20 @@ ExcludeArch: s390 s390x %define libnl_version 1.1 %define ppp_version 2.2.4 -%define snapshot .git20090220 -%define applet_snapshot .svn1189 +%define snapshot .git20090225 +%define applet_snapshot .svn1202 Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 -Version: 0.7.0.97 -Release: 6%{snapshot}%{?dist} +Version: 0.7.0.98 +Release: 1%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ -Source: %{name}-%{version}%{snapshot}.tar.gz -Source1: network-manager-applet-%{version}%{applet_snapshot}.tar.gz +Source: %{name}-%{version}%{snapshot}.tar.bz2 +Source1: network-manager-applet-%{version}%{applet_snapshot}.tar.bz2 Source2: nm-system-settings.conf Patch1: nm-applet-internal-buildfixes.patch Patch2: explain-dns1-dns2.patch @@ -141,7 +141,7 @@ NetworkManager functionality from applications that use glib. %setup -q # unpack the applet -tar -xzf %{SOURCE1} +tar -xjf %{SOURCE1} %patch1 -p1 -b .buildfix %patch2 -p1 -b .explain-dns1-dns2 @@ -324,6 +324,11 @@ fi %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Wed Feb 25 2009 Dan Williams - 1:0.7.0.98-1.git20090225 +- Fix getting secrets for system connections (rh #486696) +- More compatible modem autodetection +- Better handle minimal ifcfg files + * Mon Feb 23 2009 Fedora Release Engineering - 1:0.7.0.97-6.git20090220 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch index 84fa516..82ef7f8 100644 --- a/nm-applet-internal-buildfixes.patch +++ b/nm-applet-internal-buildfixes.patch @@ -1,6 +1,6 @@ -diff -up NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/configure.ac.buildfix NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/configure.ac ---- NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/configure.ac.buildfix 2008-11-17 08:37:21.000000000 -0500 -+++ NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/configure.ac 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/configure.ac.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/configure.ac +--- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/configure.ac.buildfix 2008-11-17 08:37:21.000000000 -0500 ++++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/configure.ac 2008-11-17 18:04:35.000000000 -0500 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.72 @@ -12,9 +12,9 @@ diff -up NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/configure.ac.bu gtk+-2.0 >= 2.10 libglade-2.0 gmodule-export-2.0 -diff -up NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/connection-editor/Makefile.am ---- NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/connection-editor/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 -+++ NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/connection-editor/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/connection-editor/Makefile.am +--- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/connection-editor/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 ++++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/connection-editor/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -2,6 +2,10 @@ NULL= bin_PROGRAMS = nm-connection-editor @@ -38,9 +38,9 @@ diff -up NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/connection- if NO_POLKIT_GNOME nm_connection_editor_LDADD += \ -diff -up NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/gconf-helpers/Makefile.am ---- NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/gconf-helpers/Makefile.am.buildfix 2008-05-06 11:16:09.000000000 -0400 -+++ NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/gconf-helpers/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/gconf-helpers/Makefile.am +--- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/gconf-helpers/Makefile.am.buildfix 2008-05-06 11:16:09.000000000 -0400 ++++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/gconf-helpers/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -58,9 +58,9 @@ diff -up NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/gconf-helpe + -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.7.0.97/network-manager-applet-0.7.0.97/src/Makefile.am.buildfix NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/Makefile.am ---- NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 -+++ NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/Makefile.am +--- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 ++++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -4,6 +4,10 @@ NULL= bin_PROGRAMS = nm-applet @@ -83,9 +83,9 @@ diff -up NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/Makefile.am gladedir = $(datadir)/nm-applet glade_DATA = applet.glade keyring.png -diff -up NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/utils/Makefile.am.buildfix NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/utils/Makefile.am ---- NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/utils/Makefile.am.buildfix 2008-05-19 11:02:18.000000000 -0400 -+++ NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/utils/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/utils/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/utils/Makefile.am +--- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/utils/Makefile.am.buildfix 2008-05-19 11:02:18.000000000 -0400 ++++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/utils/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -103,9 +103,9 @@ diff -up NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/utils/Makef + -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.7.0.97/network-manager-applet-0.7.0.97/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/wireless-security/Makefile.am ---- NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/wireless-security/Makefile.am.buildfix 2008-03-30 13:17:59.000000000 -0400 -+++ NetworkManager-0.7.0.97/network-manager-applet-0.7.0.97/src/wireless-security/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/wireless-security/Makefile.am +--- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/wireless-security/Makefile.am.buildfix 2008-03-30 13:17:59.000000000 -0400 ++++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/wireless-security/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libwireless-security.la diff --git a/sources b/sources index e51a46e..610cb55 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -5c98910ebd6f3f6a2e91160443a975b6 NetworkManager-0.7.0.97.git20090220.tar.gz -05c519e827d766359d9819e95d22dc0f network-manager-applet-0.7.0.97.svn1189.tar.gz +870f57ad87eafa2ef411b8e71a462e8a NetworkManager-0.7.0.98.git20090225.tar.bz2 +8f8ac796d7c14378cc7d073fdce8470c network-manager-applet-0.7.0.98.svn1202.tar.bz2