rpms/NetworkManager/F-9 NetworkManager.spec, 1.248, 1.249 nm-applet-internal-buildfixes.patch, 1.2, 1.3 old-dbus-glib.patch, 1.1, 1.2 sources, 1.127, 1.128
Daniel Williams
dcbw at fedoraproject.org
Thu Feb 19 04:45:45 UTC 2009
Author: dcbw
Update of /cvs/pkgs/rpms/NetworkManager/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20722
Modified Files:
NetworkManager.spec nm-applet-internal-buildfixes.patch
old-dbus-glib.patch sources
Log Message:
* Thu Feb 19 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.97-2
- Fix 'noreplace' for nm-system-settings.conf
* Wed Feb 18 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.97-1
- Update to 0.7.1rc1
- nm: support for Huawei E160G mobile broadband devices (rh #466177)
- nm: fix misleading routing error message (rh #477916)
- nm: fix issues with 32-character SSIDs (rh #485312)
- nm: allow root to activate user connections
- nm: automatic modem detection with udev-extras
- nm: massive manpage rewrite
- applet: fix crash when showing the CA certificate ignore dialog a second time
- applet: clear keyring items when deleting a connection
- applet: fix max signal strength calculation in menu (rh #475123)
- applet: fix VPN export (rh #480496)
Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/NetworkManager.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- NetworkManager.spec 7 Feb 2009 14:44:19 -0000 1.248
+++ NetworkManager.spec 19 Feb 2009 04:45:14 -0000 1.249
@@ -9,20 +9,20 @@
%define libnl_version 1.1
%define ppp_version 2.2.4
-%define snapshot git20090207
-%define applet_snapshot svn1148
+%define snapshot %{nil}
+%define applet_snapshot %{nil}
Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
-Version: 0.7.0
-Release: 2.%{snapshot}%{?dist}
+Version: 0.7.0.97
+Release: 2%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
-Source: %{name}-%{version}.%{snapshot}.tar.bz2
-Source1: network-manager-applet-%{version}.%{applet_snapshot}.tar.gz
+Source: %{name}-%{version}%{snapshot}.tar.gz
+Source1: network-manager-applet-%{version}%{applet_snapshot}.tar.gz
Source2: nm-system-settings.conf
Patch1: nm-applet-internal-buildfixes.patch
Patch2: explain-dns1-dns2.patch
@@ -41,6 +41,7 @@
Requires: ppp >= %{ppp_version}
Requires: avahi-autoipd
Requires: dnsmasq
+Requires: udev-extras udev
Obsoletes: dhcdbd
Conflicts: NetworkManager-vpnc < 1:0.7.0-1
@@ -164,7 +165,7 @@
make
# build the applet
-pushd network-manager-applet-0.7.0
+pushd network-manager-applet-%{version}
autoreconf -i
intltoolize --force
%configure --disable-static --enable-more-warnings=yes
@@ -180,7 +181,7 @@
%{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
# install the applet
-pushd network-manager-applet-0.7.0
+pushd network-manager-applet-%{version}
make install DESTDIR=$RPM_BUILD_ROOT
popd
@@ -258,7 +259,7 @@
%dir %{_sysconfdir}/%{name}/
%dir %{_sysconfdir}/%{name}/dispatcher.d
%dir %{_sysconfdir}/%{name}/VPN
-%config %{_sysconfdir}/%{name}/nm-system-settings.conf
+%config(noreplace) %{_sysconfdir}/%{name}/nm-system-settings.conf
%{_bindir}/nm-tool
%{_bindir}/nm-online
%{_libexecdir}/nm-dhcp-client.action
@@ -294,7 +295,9 @@
%{_datadir}/nm-applet/
%{_datadir}/icons/hicolor/16x16/apps/*.png
%{_datadir}/icons/hicolor/22x22/apps/*.png
+%{_datadir}/icons/hicolor/32x32/apps/*.png
%{_datadir}/icons/hicolor/48x48/apps/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
%{_sysconfdir}/xdg/autostart/nm-applet.desktop
%dir %{_datadir}/gnome-vpn-properties
@@ -321,6 +324,22 @@
%{_datadir}/gtk-doc/html/libnm-util/*
%changelog
+* Thu Feb 19 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.97-2
+- Fix 'noreplace' for nm-system-settings.conf
+
+* Wed Feb 18 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.97-1
+- Update to 0.7.1rc1
+- nm: support for Huawei E160G mobile broadband devices (rh #466177)
+- nm: fix misleading routing error message (rh #477916)
+- nm: fix issues with 32-character SSIDs (rh #485312)
+- nm: allow root to activate user connections
+- nm: automatic modem detection with udev-extras
+- nm: massive manpage rewrite
+- applet: fix crash when showing the CA certificate ignore dialog a second time
+- applet: clear keyring items when deleting a connection
+- applet: fix max signal strength calculation in menu (rh #475123)
+- applet: fix VPN export (rh #480496)
+
* Sat Feb 7 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0-2.git20090207
- applet: fix blank VPN connection message bubbles
- applet: better handling of VPN routing on update
nm-applet-internal-buildfixes.patch:
Index: nm-applet-internal-buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/nm-applet-internal-buildfixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nm-applet-internal-buildfixes.patch 3 Jan 2009 06:34:19 -0000 1.2
+++ nm-applet-internal-buildfixes.patch 19 Feb 2009 04:45:14 -0000 1.3
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac
---- NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac.buildfix 2008-11-17 08:37:21.000000000 -0500
-+++ NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac 2008-11-17 18:04:35.000000000 -0500
+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
@@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
PKG_CHECK_MODULES(NMA,
[dbus-glib-1 >= 0.72
@@ -12,9 +12,9 @@
gtk+-2.0 >= 2.10
libglade-2.0
gmodule-export-2.0
-diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am
---- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500
-+++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am 2008-11-17 18:04:35.000000000 -0500
+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
@@ -2,6 +2,10 @@ NULL=
bin_PROGRAMS = nm-connection-editor
@@ -38,9 +38,9 @@
if NO_POLKIT_GNOME
nm_connection_editor_LDADD += \
-diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix 2008-05-06 11:16:09.000000000 -0400
-+++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am 2008-11-17 18:04:35.000000000 -0500
+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
@@ -1,3 +1,7 @@
+INCLUDES = -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \
@@ -58,9 +58,9 @@
+ -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/network-manager-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am
---- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500
-+++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am 2008-11-17 18:04:35.000000000 -0500
+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
@@ -4,6 +4,10 @@ NULL=
bin_PROGRAMS = nm-applet
@@ -83,9 +83,9 @@
gladedir = $(datadir)/nm-applet
glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am
---- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am.buildfix 2008-05-19 11:02:18.000000000 -0400
-+++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am 2008-11-17 18:04:35.000000000 -0500
+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
@@ -1,3 +1,7 @@
+INCLUDES = -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \
@@ -103,9 +103,9 @@
+ -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/network-manager-applet-0.7.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am
---- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am.buildfix 2008-03-30 13:17:59.000000000 -0400
-+++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am 2008-11-17 18:04:35.000000000 -0500
+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
@@ -1,5 +1,9 @@
noinst_LTLIBRARIES = libwireless-security.la
old-dbus-glib.patch:
Index: old-dbus-glib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/old-dbus-glib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- old-dbus-glib.patch 18 Jul 2008 18:21:23 -0000 1.1
+++ old-dbus-glib.patch 19 Feb 2009 04:45:14 -0000 1.2
@@ -1,12 +1,13 @@
-diff -up NetworkManager-0.7.0/configure.in.dbusglib NetworkManager-0.7.0/configure.in
---- NetworkManager-0.7.0/configure.in.dbusglib 2008-07-18 14:17:51.000000000 -0400
-+++ NetworkManager-0.7.0/configure.in 2008-07-18 14:18:14.000000000 -0400
+diff -up NetworkManager-0.7.0.97/configure.in.dbusglib NetworkManager-0.7.0.97/configure.in
+--- NetworkManager-0.7.0.97/configure.in.dbusglib 2008-07-18 14:17:51.000000000 -0400
++++ NetworkManager-0.7.0.97/configure.in 2008-07-18 14:18:14.000000000 -0400
@@ -170,7 +170,7 @@ if test "$ac_have_iwevgenie" = no; then
- AC_MSG_ERROR(wireless-tools >= 28pre9 not installed or not functional)
+ AC_MSG_ERROR(wireless-tools library and development headers >= 28pre9 not installed or not functional)
fi
--PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.75)
-+PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.74)
+-PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.1 dbus-glib-1 >= 0.75)
++PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.1 dbus-glib-1 >= 0.74)
+ AC_SUBST(DBUS_CFLAGS)
+ AC_SUBST(DBUS_LIBS)
- ##### Find out the version of DBUS we're using
- dbus_version=`pkg-config --modversion dbus-1`
+
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/sources,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- sources 7 Feb 2009 14:44:19 -0000 1.127
+++ sources 19 Feb 2009 04:45:14 -0000 1.128
@@ -1,2 +1,2 @@
-6867d9428c940e10a8439c33a24462c5 NetworkManager-0.7.0.git20090207.tar.bz2
-98648f3ba457551d313485e5d67e3183 network-manager-applet-0.7.0.svn1148.tar.gz
+b337385e4dbd60b7507fd8623e360a94 NetworkManager-0.7.0.97.tar.gz
+627845b2f9a1087f1852fe807654d50d network-manager-applet-0.7.0.97.tar.gz
More information about the fedora-extras-commits
mailing list