[NetworkManager/f15/master] fix handling of infinite IPv6 RDNSS timeouts (rh #689291)

[Daniel Williams]

commit b740220b0146c7ca940e809d468be40aed710605
Author: Dan Williams <dcbw at redhat.com>
Date:   Wed Apr 6 11:24:13 2011 -0500

    fix handling of infinite IPv6 RDNSS timeouts (rh #689291)

 .gitignore          |    1 +
 NetworkManager.spec |   11 +++++++----
 sources             |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 39aecb5..aa33ce5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -236,3 +236,4 @@ network-manager-applet-0.8.1.tar.bz2
 /network-manager-applet-0.8.997.git20110331.tar.bz2
 /NetworkManager-0.8.998-compat.tar.bz2
 /network-manager-applet-0.8.998.tar.bz2
+/NetworkManager-0.8.998-compat.git20110406.tar.bz2
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 00a24e0..8b1babe 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,7 +7,7 @@
 %define libnl_version 1.1
 %define ppp_version 2.4.5
 
-%define snapshot %{nil}
+%define snapshot .git20110406
 %define applet_snapshot %{nil}
 %define realversion 0.8.998
 
@@ -15,7 +15,7 @@ Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.8.998
-Release: 1%{snapshot}%{?dist}
+Release: 2%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -419,6 +419,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Wed Apr 06 2011 Dan Williams <dcbw at redhat.com> - 0.8.998-2
+- core: fix handling of infinite IPv6 RDNSS timeouts (rh #689291)
+
 * Mon Apr 04 2011 Dan Williams <dcbw at redhat.com> - 0.8.998-1
 - Update to 0.8.998 (0.9.0-rc1)
 - core: fix near-infinite requests for passwords (rh #692783)
@@ -434,8 +437,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 - core: fix creation of default wired connections
 - core: fix requesting new secrets when old ones fail (ex changing WEP keys)
 - editor: ensure all pages are sensitive after retrieving secrets
-- editor: fix crash when scrolling through connection lists
-- applet: fix crash after using the wifi or wired secrets dialogs
+- editor: fix crash when scrolling through connection lists (rh #693446)
+- applet: fix crash after using the wifi or wired secrets dialogs (rh #693446)
 
 * Mon Mar 28 2011 Christopher Aillon <caillon at redhat.com> - 0.8.997-6.git20110328
 - Fix trigger to enable the systemd service for upgrades (rh #678553)
diff --git a/sources b/sources
index 445d139..8e4c56e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-cdfc2e800bb627a575d4564253748483  NetworkManager-0.8.998-compat.tar.bz2
 33e187b22b5cb99df331c8f0b67e9e57  network-manager-applet-0.8.998.tar.bz2
+21afefb48195a1cb52a808d56d519ad8  NetworkManager-0.8.998-compat.git20110406.tar.bz2