rpms/NetworkManager/F-9 .cvsignore, 1.87, 1.88 NetworkManager.spec, 1.249, 1.250 sources, 1.128, 1.129
Daniel Williams
dcbw at fedoraproject.org
Thu Feb 19 22:56:57 UTC 2009
Author: dcbw
Update of /cvs/pkgs/rpms/NetworkManager/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27835
Modified Files:
.cvsignore NetworkManager.spec sources
Log Message:
* Thu Feb 19 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.97-4.git20090219
- Fix PEAP version selection in the applet (rh #468844)
- Match hostname behavior to 'network' service when hostname is localhost (rh #441453)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/.cvsignore,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- .cvsignore 27 Aug 2008 20:33:13 -0000 1.87
+++ .cvsignore 19 Feb 2009 22:56:27 -0000 1.88
@@ -102,19 +102,37 @@
nm-applet-0.7.0.svn689.tar.gz
NetworkManager-0.7.0.svn3590.tar.gz
nm-applet-0.7.0.svn694.tar.gz
-NetworkManager-0.7.0.svn3614.tar.gz
-nm-applet-0.7.0.svn703.tar.gz
-NetworkManager-0.7.0.svn3619.tar.gz
-nm-applet-0.7.0.svn708.tar.gz
-NetworkManager-0.7.0.svn3620.tar.gz
-NetworkManager-0.7.0.svn3622.tar.gz
-nm-applet-0.7.0.svn709.tar.gz
-NetworkManager-0.7.0.svn3623.tar.gz
-NetworkManager-0.7.0.svn3665.tar.gz
-nm-applet-0.7.0.svn724.tar.gz
-NetworkManager-0.7.0.svn3667.tar.gz
-NetworkManager-0.7.0.svn3669.tar.gz
-NetworkManager-0.7.0.svn3747.tar.gz
-nm-applet-0.7.0.svn755.tar.gz
-NetworkManager-0.7.0.svn4022.tar.gz
-nm-applet-0.7.0.svn870.tar.gz
+NetworkManager-0.7.0.svn3675.tar.gz
+nm-applet-0.7.0.svn727.tar.gz
+NetworkManager-0.7.0.svn3801.tar.gz
+nm-applet-0.7.0.svn774.tar.gz
+NetworkManager-0.7.0.svn3830.tar.gz
+nm-applet-0.7.0.svn792.tar.gz
+NetworkManager-0.7.0.svn3846.tar.gz
+nm-applet-0.7.0.svn798.tar.gz
+NetworkManager-0.7.0.svn3927.tar.gz
+nm-applet-0.7.0.svn837.tar.gz
+NetworkManager-0.7.0.svn3930.tar.gz
+nm-applet-0.7.0.svn838.tar.gz
+NetworkManager-0.7.0.svn4174.tar.gz
+nm-applet-0.7.0.svn939.tar.gz
+NetworkManager-0.7.0.svn4175.tar.gz
+NetworkManager-0.7.0.svn4201.tar.gz
+nm-applet-0.7.0.svn958.tar.gz
+NetworkManager-0.7.0.svn4229.tar.gz
+nm-applet-0.7.0.svn986.tar.gz
+NetworkManager-0.7.0.svn4295.tar.gz
+nm-applet-0.7.0.svn1031.tar.gz
+NetworkManager-0.7.0.svn4296.tar.gz
+nm-applet-0.7.0.svn1033.tar.gz
+NetworkManager-0.7.0.svn4326.tar.gz
+nm-applet-0.7.0.svn1043.tar.gz
+NetworkManager-0.7.0.git20090102.tar.bz2
+network-manager-applet-0.7.0.svn1091.tar.gz
+NetworkManager-0.7.0.git20090207.tar.bz2
+network-manager-applet-0.7.0.svn1146.tar.gz
+network-manager-applet-0.7.0.svn1148.tar.gz
+NetworkManager-0.7.0.97.tar.gz
+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
Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/NetworkManager.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- NetworkManager.spec 19 Feb 2009 04:45:14 -0000 1.249
+++ NetworkManager.spec 19 Feb 2009 22:56:27 -0000 1.250
@@ -1,3 +1,5 @@
+%define udev_scriptdir /lib/udev
+
ExcludeArch: s390 s390x
%define dbus_version 1.1
@@ -9,14 +11,14 @@
%define libnl_version 1.1
%define ppp_version 2.2.4
-%define snapshot %{nil}
-%define applet_snapshot %{nil}
+%define snapshot .git20090219
+%define applet_snapshot .svn1189
Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
Version: 0.7.0.97
-Release: 2%{snapshot}%{?dist}
+Release: 4%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
@@ -41,7 +43,7 @@
Requires: ppp >= %{ppp_version}
Requires: avahi-autoipd
Requires: dnsmasq
-Requires: udev-extras udev
+Requires: udev
Obsoletes: dhcdbd
Conflicts: NetworkManager-vpnc < 1:0.7.0-1
@@ -207,6 +209,9 @@
%{__cp} ORIG-docs/libnm-glib/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-glib/
%{__cp} ORIG-docs/libnm-util/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-util/
+# Move the udev rules to where F-9 udev expects them
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
+%{__mv} $RPM_BUILD_ROOT%{udev_scriptdir}/rules.d/77-nm-probe-modem-capabilities.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
%clean
%{__rm} -rf $RPM_BUILD_ROOT
@@ -278,6 +283,8 @@
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
%{_libdir}/pppd/2.4.4/nm-pppd-plugin.so
%{_datadir}/PolicyKit/policy/*.policy
+%{udev_scriptdir}/nm-modem-probe
+%{_sysconfdir}/udev/rules.d/77-nm-probe-modem-capabilities.rules
%files devel
%defattr(-,root,root,0755)
@@ -324,6 +331,10 @@
%{_datadir}/gtk-doc/html/libnm-util/*
%changelog
+* Thu Feb 19 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.97-4.git20090219
+- Fix PEAP version selection in the applet (rh #468844)
+- Match hostname behavior to 'network' service when hostname is localhost (rh #441453)
+
* Thu Feb 19 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.97-2
- Fix 'noreplace' for nm-system-settings.conf
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/sources,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- sources 19 Feb 2009 04:45:14 -0000 1.128
+++ sources 19 Feb 2009 22:56:27 -0000 1.129
@@ -1,2 +1,2 @@
-b337385e4dbd60b7507fd8623e360a94 NetworkManager-0.7.0.97.tar.gz
-627845b2f9a1087f1852fe807654d50d network-manager-applet-0.7.0.97.tar.gz
+099f44a9013ba91479adf16e8494b43f NetworkManager-0.7.0.97.git20090219.tar.gz
+05c519e827d766359d9819e95d22dc0f network-manager-applet-0.7.0.97.svn1189.tar.gz
More information about the fedora-extras-commits
mailing list