[NetworkManager/f13/master] New git snapshot for #626337 and #627365

Daniel Williams dcbw at fedoraproject.org
Tue Aug 31 15:45:46 UTC 2010 

commit f58b3ab0d8604e87c97f4aa4ecd803fdcb998595
Author: Dan Williams <dcbw at redhat.com>
Date:   Tue Aug 31 10:47:39 2010 -0500

    New git snapshot for #626337 and #627365
    
    * Tue Aug 31 2010 Dan Williams <dcbw at redhat.com> - 0.8.1-6
    - core: add dispatcher events on DHCPv4 and DHCPv6 lease changes
    - core: enforce access permissions when enabling/disabling WiFi and WWAN (rh #626337)
    - applet: fix disabled Enable Networking and Enable Wireless menu items (rh #627365)
    - applet: updated translations
    - applet: obscure Mobile Broadband PIN in secondary unlock dialog

 .gitignore                          |    2 +
 NetworkManager.spec                 |   56 ++++++++++++++++++++++++++++++----
 nm-applet-internal-buildfixes.patch |   19 ++++++-----
 sources                             |    4 +-
 4 files changed, 63 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e588304..e8f4aab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -191,3 +191,5 @@ network-manager-applet-0.8.git20100219.tar.bz2
 nmcli-git20100219.tar.bz2
 NetworkManager-0.8.1.git20100813.tar.bz2
 network-manager-applet-0.8.1.git20100813.tar.bz2
+/NetworkManager-0.8.1.git20100831.tar.bz2
+/network-manager-applet-0.8.1.git20100831.tar.bz2
diff --git a/NetworkManager.spec b/NetworkManager.spec
index ab93dba..75f0026 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,15 +7,20 @@
 %define libnl_version 1.1
 %define ppp_version 2.4.5
 
-%define snapshot .git20100817
-%define applet_snapshot .git20100817
+%define snapshot .git20100831
+%define applet_snapshot .git20100831
 %define realversion 0.8.1
 
+%define use_systemd 0
+%if 0%{?fedora} >= 14
+%define use_systemd 1
+%endif
+
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.8.1
-Release: 4%{snapshot}%{?dist}
+Release: 6%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -80,7 +85,7 @@ BuildRequires: desktop-file-utils
 %ifnarch s390 s390x
 BuildRequires: gnome-bluetooth-libs-devel >= 2.27.7.1-1
 %endif
-%if 0%{?fedora} >= 14
+%if %{use_systemd}
 BuildRequires: systemd
 %endif
 
@@ -183,7 +188,10 @@ make %{?_smp_mflags}
 pushd network-manager-applet-%{realversion}
 	autoreconf -i
 	intltoolize --force
-	%configure --disable-static --enable-more-warnings=yes
+	%configure \
+		--disable-static \
+		--with-bluetooth \
+		--enable-more-warnings=yes
 	make %{?_smp_mflags}
 popd
 
@@ -239,9 +247,14 @@ desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desk
 
 
 %post
-if [ "$1" == "1" ]; then
+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
@@ -249,8 +262,27 @@ if [ $1 -eq 0 ]; then
     /sbin/service NetworkManager stop >/dev/null 2>&1
     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
+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
 /sbin/chkconfig --del NetworkManagerDispatcher
@@ -327,7 +359,7 @@ fi
 %{_datadir}/polkit-1/actions/*.policy
 /lib/udev/rules.d/*.rules
 # systemd stuff
-%if 0%{?fedora} >= 14
+%if %{use_systemd}
 /lib/systemd/system/NetworkManager.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service
 %endif
@@ -382,6 +414,16 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Tue Aug 31 2010 Dan Williams <dcbw at redhat.com> - 0.8.1-6
+- core: add dispatcher events on DHCPv4 and DHCPv6 lease changes
+- core: enforce access permissions when enabling/disabling WiFi and WWAN (rh #626337)
+- applet: fix disabled Enable Networking and Enable Wireless menu items (rh #627365)
+- applet: updated translations
+- applet: obscure Mobile Broadband PIN in secondary unlock dialog
+
+* Wed Aug 18 2010 Dan Williams <dcbw at redhat.com> - 0.8.1-5
+- core: fix some systemd interaction issues
+
 * Tue Aug 17 2010 Dan Williams <dcbw at redhat.com> - 0.8.1-4
 - core: rebuild to fix polkit 0.97 build issue
 - applet: updated translations
diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch
index 3b0006d..dade875 100644
--- a/nm-applet-internal-buildfixes.patch
+++ b/nm-applet-internal-buildfixes.patch
@@ -13,15 +13,16 @@ diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac.buildfix
  		 libglade-2.0
  		 gmodule-export-2.0
 @@ -192,9 +188,7 @@ AC_SUBST(DBUS_SYS_DIR)
- dnl Check for gnome-bluetooth
- PKG_CHECK_MODULES(GNOME_BLUETOOTH,
- 		  gconf-2.0
--		  gnome-bluetooth-1.0 >= 2.27.6
--		  libnm-util >= 0.8.1
--		  libnm-glib >= 0.8.1,
-+		  gnome-bluetooth-1.0 >= 2.27.6,
- 		  have_gbt=yes, have_gbt=no)
- AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
+ 		AC_MSG_CHECKING(for gnome-bluetooth)
+ 		PKG_CHECK_MODULES(GNOME_BLUETOOTH,
+ 				  gconf-2.0
+-				  gnome-bluetooth-1.0 >= 2.27.6
+-				  libnm-util >= 0.8.1
+-				  libnm-glib >= 0.8.1,
++				  gnome-bluetooth-1.0 >= 2.27.6,
+ 				  have_gbt=yes, have_gbt=no)
+ 		;;
+ esac
  
 diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am
 --- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am.buildfix	2009-07-23 10:51:39.000000000 -0400
diff --git a/sources b/sources
index d34edbd..b72612d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-436fdced81eadb278c3ad194d2b02c99  NetworkManager-0.8.1.git20100817.tar.bz2
-5faff7a57d405d501063ad94bdae81e1  network-manager-applet-0.8.1.git20100817.tar.bz2
+ac87c6b71a88e8716c0f191040087fa0  NetworkManager-0.8.1.git20100831.tar.bz2
+43c0b014895dc78e0ea9c86aa917b427  network-manager-applet-0.8.1.git20100831.tar.bz2

More information about the scm-commits mailing list