[NetworkManager/f15] Update to git snapshot

[Daniel Williams]

commit 33dc725ca444267815b8f128e1799c142479957a
Author: Dan Williams <dcbw at redhat.com>
Date:   Sat Jul 2 16:17:30 2011 -0500

    Update to git snapshot

 .gitignore          |    2 ++
 NetworkManager.spec |   18 ++++++++++++++----
 sources             |    4 ++--
 3 files changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0d56a63..b4b40b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -253,3 +253,5 @@ network-manager-applet-0.8.1.tar.bz2
 /network-manager-applet-0.8.9997.git20110613.tar.bz2
 /NetworkManager-0.8.9997-compat.git20110620.tar.bz2
 /network-manager-applet-0.8.9997.git20110620.tar.bz2
+/NetworkManager-0.8.9997.git20110702.tar.bz2
+/network-manager-applet-0.8.9997.git20110702.tar.bz2
diff --git a/NetworkManager.spec b/NetworkManager.spec
index a06a628..e72441b 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,20 +7,20 @@
 %define libnl_version 1.1
 %define ppp_version 2.4.5
 
-%define snapshot .git20110620
-%define applet_snapshot .git20110620
+%define snapshot .git20110702
+%define applet_snapshot .git20110702
 %define realversion 0.8.9997
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.8.9997
-Release: 4%{snapshot}%{?dist}
+Release: 5%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 
-Source: %{name}-%{realversion}-compat%{snapshot}.tar.bz2
+Source: %{name}-%{realversion}%{snapshot}.tar.bz2
 Source1: network-manager-applet-%{realversion}%{applet_snapshot}.tar.bz2
 Source2: NetworkManager.conf
 Patch1: nm-applet-internal-buildfixes.patch
@@ -56,6 +56,7 @@ Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1
 Conflicts: NetworkManager-openvpn < 1:0.7.0.99-1
 Conflicts: NetworkManager-pptp < 1:0.7.0.99-1
 Conflicts: NetworkManager-openconnect < 0:0.7.0.99-1
+Conflicts: kde-plasma-networkmanagement < 1:0.9-0.49.20110527git.nm09
 
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -420,6 +421,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Sat Jul  2 2011 Dan Williams <dcbw at redhat.com> - 0.8.9997-5.git20110702
+- core: ensure users are authorized for shared wifi connections (CVE-2011-2176) (rh #715492)
+- core: retry failed connections after 5 minute timeout
+- core: immediately request new 802.1x 'always ask' passwords if they fail
+- core: add MAC blacklisting capability for WiFi and Wired connections
+- core: retry failed connections when new users log in (rh #706204)
+- applet: updated translations
+- core: drop compat interface now that KDE bits are updated to NM 0.9 API
+
 * Mon Jun 20 2011 Dan Williams <dcbw at redhat.com> - 0.8.9997-4.git20110620
 - core: don't cache "(none)" hostname at startup (rh #706094)
 - core: fix handling of VPN connections with only system-owned secrets
diff --git a/sources b/sources
index c89d5c2..9cf3c2e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2891afe0035016ba9f58aa5dddc0a5be  NetworkManager-0.8.9997-compat.git20110620.tar.bz2
-d124ea2ffa31a659d4890f83e342150a  network-manager-applet-0.8.9997.git20110620.tar.bz2
+64dd1a87e0bf636590a184e7eacdae4d  NetworkManager-0.8.9997.git20110702.tar.bz2
+f12076465109949a142de0d52dc8e5b7  network-manager-applet-0.8.9997.git20110702.tar.bz2