[NetworkManager/f15/master] core: add compatibility layer for KDE Plasma network infrastructure

[Daniel Williams]

commit 620eaceb5d747d04679d4c53e02ced1f81b6d20e
Author: Dan Williams <dcbw at redhat.com>
Date:   Thu Mar 24 14:24:27 2011 -0500

    core: add compatibility layer for KDE Plasma network infrastructure

 .gitignore                     |    2 +
 NetworkManager.spec            |   13 ++++--
 fix-logging-format-types.patch |   92 ----------------------------------------
 nm-polkit-permissive.patch     |   12 +++++
 sources                        |    4 +-
 5 files changed, 24 insertions(+), 99 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 96f465f..a268229 100644
--- a/.gitignore
+++ b/.gitignore
@@ -224,3 +224,5 @@ network-manager-applet-0.8.1.tar.bz2
 /network-manager-applet-0.8.996.tar.bz2
 /NetworkManager-0.8.997.tar.bz2
 /network-manager-applet-0.8.997.tar.bz2
+/NetworkManager-0.8.997.git20110324.tar.bz2
+/network-manager-applet-0.8.997.git20110324.tar.bz2
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 29f9b7e..e9438fd 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,8 +7,8 @@
 %define libnl_version 1.1
 %define ppp_version 2.4.5
 
-%define snapshot %{nil}
-%define applet_snapshot %{nil}
+%define snapshot .git20110324
+%define applet_snapshot .git20110324
 %define realversion 0.8.997
 
 %define use_systemd 0
@@ -20,7 +20,7 @@ Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.8.997
-Release: 1%{snapshot}%{?dist}
+Release: 2%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -31,7 +31,7 @@ Source2: NetworkManager.conf
 Patch1: nm-applet-internal-buildfixes.patch
 Patch2: explain-dns1-dns2.patch
 Patch3: nm-applet-no-notifications.patch
-Patch4: fix-logging-format-types.patch
+Patch4: nm-polkit-permissive.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): chkconfig
@@ -169,7 +169,7 @@ tar -xjf %{SOURCE1}
 %patch1 -p1 -b .buildfix
 %patch2 -p1 -b .explain-dns1-dns2
 %patch3 -p1 -b .no-notifications
-%patch4 -p1 -b .fix-logging-format-types
+%patch4 -p1 -b .polkit-permissive
 
 %build
 
@@ -436,6 +436,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Thu Mar 24 2011 Dan Williams <dcbw at redhat.com> - 0.8.997-2.git20110324
+- core: add compatibility layer for KDE Plasma network infrastructure
+
 * Mon Mar 21 2011 Dan Williams <dcbw at redhat.com> - 0.8.997-1
 - Update to 0.8.997 (0.9-beta3)
 - ifcfg-rh: fix reading and writing of Dynamic WEP connections using LEAP as the eap method
diff --git a/nm-polkit-permissive.patch b/nm-polkit-permissive.patch
new file mode 100644
index 0000000..1ac4062
--- /dev/null
+++ b/nm-polkit-permissive.patch
@@ -0,0 +1,12 @@
+diff -up NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in
+--- NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive	2011-03-24 14:21:35.100912222 -0500
++++ NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in	2011-03-24 14:21:49.916726997 -0500
+@@ -95,7 +95,7 @@
+     <_message>System policy prevents modification of network settings for all users</_message>
+     <defaults>
+       <allow_inactive>no</allow_inactive>
+-      <allow_active>auth_admin_keep</allow_active>
++      <allow_active>yes</allow_active>
+     </defaults>
+   </action>
+ 
diff --git a/sources b/sources
index dfd1331..ec61ae8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-dd0753b7dc006519bd1e2df38c081633  NetworkManager-0.8.997.tar.bz2
-522fa55df73c11002ee93133a235d932  network-manager-applet-0.8.997.tar.bz2
+80e7d32e6f4affd032606498c98bc7b1  NetworkManager-0.8.997.git20110324.tar.bz2
+32f8226697769e2f5b944db7a3c3010b  network-manager-applet-0.8.997.git20110324.tar.bz2