rpms/NetworkManager/F-11 .cvsignore, 1.106, 1.107 NetworkManager.spec, 1.278, 1.279 nm-applet-internal-buildfixes.patch, 1.8, 1.9 sources, 1.144, 1.145 nm-applet-file-chooser-validation.patch, 1.1, NONE
Daniel Williams
dcbw at fedoraproject.org
Thu Oct 15 15:58:13 UTC 2009
Author: dcbw
Update of /cvs/pkgs/rpms/NetworkManager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17111
Modified Files:
.cvsignore NetworkManager.spec
nm-applet-internal-buildfixes.patch sources
Removed Files:
nm-applet-file-chooser-validation.patch
Log Message:
* Thu Oct 15 2009 Dan Williams <dcbw at redhat.com> - 0.7.1.996-1.git20091015
- nm: add support for PEAP-GTC (rh #451027)
- nm: ensure VPN secrets aren't re-used when they shouldn't be
- nm: fix race causing erroneous ethernet carrier change events
- nm: fixes for ZTE/Onda modem detection
- nm: enhanced support for Ericsson 'mbm' modems
- nm: work around PPP bug returning bogus nameservers
- applet: PEAP, TTLS, and wired 802.1x fixes
- applet: install GConf schemas
- applet: fix default focus for passphrase dialogs
- applet: translation updates
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/.cvsignore,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- .cvsignore 8 Jul 2009 17:29:20 -0000 1.106
+++ .cvsignore 15 Oct 2009 15:58:12 -0000 1.107
@@ -157,3 +157,7 @@ NetworkManager-0.7.1.git20090617.tar.bz2
network-manager-applet-0.7.1.git20090617.tar.bz2
NetworkManager-0.7.1.git20090708.tar.bz2
network-manager-applet-0.7.1.git20090708.tar.bz2
+NetworkManager-0.7.1.995.git20090928.tar.bz2
+network-manager-applet-0.7.1.995.git20090928.tar.bz2
+NetworkManager-0.7.1.996.git20091015.tar.bz2
+network-manager-applet-0.7.1.996.tar.bz2
Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/NetworkManager.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -p -r1.278 -r1.279
--- NetworkManager.spec 9 Jul 2009 17:53:23 -0000 1.278
+++ NetworkManager.spec 15 Oct 2009 15:58:12 -0000 1.279
@@ -9,14 +9,14 @@
%define libnl_version 1.1
%define ppp_version 2.2.4
-%define snapshot .git20090708
-%define applet_snapshot .git20090708
+%define snapshot .git20091015
+%define applet_snapshot %{nil}
Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
-Version: 0.7.1
-Release: 8%{snapshot}%{?dist}
+Version: 0.7.1.996
+Release: 1%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
@@ -26,7 +26,6 @@ Source1: network-manager-applet-%{versio
Source2: nm-system-settings.conf
Patch1: nm-applet-internal-buildfixes.patch
Patch2: explain-dns1-dns2.patch
-Patch3: nm-applet-file-chooser-validation.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
PreReq: chkconfig
@@ -147,7 +146,6 @@ tar -xjf %{SOURCE1}
%patch1 -p1 -b .buildfix
%patch2 -p1 -b .explain-dns1-dns2
-%patch3 -p1 -b .file-chooser-validate
%build
@@ -164,14 +162,14 @@ autoreconf -i
--enable-more-warnings=yes \
--with-docs=yes \
--with-system-ca-path=/etc/pki/tls/certs
-make
+make %{?_smp_mflags}
# build the applet
pushd network-manager-applet-%{version}
autoreconf -i
intltoolize --force
%configure --disable-static --enable-more-warnings=yes
- make
+ make %{?_smp_mflags}
popd
%install
@@ -235,11 +233,31 @@ exit 0
%post glib -p /sbin/ldconfig
%postun glib -p /sbin/ldconfig
+%pre gnome
+if [ "$1" -gt 1 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
+ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+ fi
+fi
+
+%preun gnome
+if [ "$1" -eq 0 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
+ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+ fi
+fi
+
%post gnome
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
fi
+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
%postun gnome
touch --no-create %{_datadir}/icons/hicolor
@@ -304,6 +322,7 @@ fi
%{_datadir}/icons/hicolor/scalable/apps/*.svg
%{_sysconfdir}/xdg/autostart/nm-applet.desktop
%dir %{_datadir}/gnome-vpn-properties
+%{_sysconfdir}/gconf/schemas/nm-applet.schemas
%files glib
%defattr(-,root,root,0755)
@@ -328,6 +347,21 @@ fi
%{_datadir}/gtk-doc/html/libnm-util/*
%changelog
+* Thu Oct 15 2009 Dan Williams <dcbw at redhat.com> - 0.7.1.996-1.git20091015
+- nm: add support for PEAP-GTC (rh #451027)
+- nm: ensure VPN secrets aren't re-used when they shouldn't be
+- nm: fix race causing erroneous ethernet carrier change events
+- nm: fixes for ZTE/Onda modem detection
+- nm: enhanced support for Ericsson 'mbm' modems
+- nm: work around PPP bug returning bogus nameservers
+- applet: PEAP, TTLS, and wired 802.1x fixes
+- applet: install GConf schemas
+- applet: fix default focus for passphrase dialogs
+- applet: translation updates
+
+* Thu Jul 9 2009 Dan Williams <dcbw at redhat.com> - 0.7.1-8.git20090708
+- applet: fix crash on error claiming D-Bus service (rh #519408)
+
* Thu Jul 9 2009 Dan Williams <dcbw at redhat.com> - 0.7.1-8.git20090708
- applet: fix certificate validation in hidden wifi networks dialog (rh #508207)
nm-applet-internal-buildfixes.patch:
configure.ac | 4 ----
src/Makefile.am | 8 +++++++-
src/connection-editor/Makefile.am | 9 ++++++++-
src/gconf-helpers/Makefile.am | 8 +++++++-
src/utils/Makefile.am | 9 ++++++++-
src/wireless-security/Makefile.am | 8 +++++++-
6 files changed, 37 insertions(+), 9 deletions(-)
Index: nm-applet-internal-buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/nm-applet-internal-buildfixes.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nm-applet-internal-buildfixes.patch 17 Jun 2009 18:47:51 -0000 1.8
+++ nm-applet-internal-buildfixes.patch 15 Oct 2009 15:58:12 -0000 1.9
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac.buildfix 2009-04-04 18:03:25.000000000 -0400
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac 2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/configure.ac.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/configure.ac
+--- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/configure.ac.buildfix 2009-04-04 18:03:25.000000000 -0400
++++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/configure.ac 2009-04-05 08:31:12.000000000 -0400
@@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
PKG_CHECK_MODULES(NMA,
[dbus-glib-1 >= 0.74
@@ -12,9 +12,9 @@ diff -up NetworkManager-0.7.1/network-ma
gtk+-2.0 >= 2.14
libglade-2.0
gmodule-export-2.0
-diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am.buildfix 2009-04-03 09:30:25.000000000 -0400
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am 2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/connection-editor/Makefile.am.buildfix 2009-04-03 09:30:25.000000000 -0400
++++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/connection-editor/Makefile.am 2009-04-05 08:31:12.000000000 -0400
@@ -1,5 +1,9 @@
bin_PROGRAMS = nm-connection-editor
@@ -37,9 +37,9 @@ diff -up NetworkManager-0.7.1/network-ma
if NO_POLKIT_GNOME
nm_connection_editor_LDADD += \
-diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am.buildfix 2008-11-26 20:37:43.000000000 -0500
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am 2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/gconf-helpers/Makefile.am.buildfix 2008-11-26 20:37:43.000000000 -0500
++++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/gconf-helpers/Makefile.am 2009-04-05 08:31:12.000000000 -0400
@@ -1,3 +1,7 @@
+INCLUDES = -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \
@@ -57,9 +57,9 @@ diff -up NetworkManager-0.7.1/network-ma
+ -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.1/network-manager-applet-0.7.1/src/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am.buildfix 2008-11-26 20:37:48.000000000 -0500
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am 2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/Makefile.am.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/Makefile.am
+--- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/Makefile.am.buildfix 2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/Makefile.am 2009-04-05 08:31:12.000000000 -0400
@@ -4,6 +4,10 @@ NULL=
bin_PROGRAMS = nm-applet
@@ -82,9 +82,9 @@ diff -up NetworkManager-0.7.1/network-ma
gladedir = $(datadir)/nm-applet
glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am.buildfix 2008-11-26 20:37:48.000000000 -0500
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am 2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/utils/Makefile.am.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/utils/Makefile.am
+--- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/utils/Makefile.am.buildfix 2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/utils/Makefile.am 2009-04-05 08:31:12.000000000 -0400
@@ -1,3 +1,7 @@
+INCLUDES = -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \
@@ -102,9 +102,9 @@ diff -up NetworkManager-0.7.1/network-ma
+ -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.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am.buildfix 2009-04-04 11:33:58.000000000 -0400
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am 2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/wireless-security/Makefile.am
+--- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/wireless-security/Makefile.am.buildfix 2009-04-04 11:33:58.000000000 -0400
++++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/wireless-security/Makefile.am 2009-04-05 08:31:12.000000000 -0400
@@ -1,5 +1,9 @@
noinst_LTLIBRARIES = libwireless-security.la
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/sources,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- sources 8 Jul 2009 17:29:20 -0000 1.144
+++ sources 15 Oct 2009 15:58:12 -0000 1.145
@@ -1,2 +1,2 @@
-f361c757fda787a2a90719b9ae668702 NetworkManager-0.7.1.git20090708.tar.bz2
-801d31708a175d2133edc66007667d71 network-manager-applet-0.7.1.git20090708.tar.bz2
+451ac8f50f400c821b4a911074222063 NetworkManager-0.7.1.996.git20091015.tar.bz2
+e7ee1e623756c632134dc6b4cf47bcb1 network-manager-applet-0.7.1.996.tar.bz2
--- nm-applet-file-chooser-validation.patch DELETED ---
More information about the fedora-extras-commits
mailing list