From d86688f83066c84025e6b626347a5a3c3d154d64 Mon Sep 17 00:00:00 2001
From: Daniel Williams <dcbw@fedoraproject.org>
Date: Tue, 18 Mar 2008 17:02:45 +0000
Subject: [PATCH] - Fix crashes on suspend/resume and exit (rh #437426) -
 Ensure there's always an option to chose the wired device - Never set default
 route via an IPv4 link-local addressed device (rh     #437338)

---
 .cvsignore          |  3 +++
 NetworkManager.spec | 15 ++++++++++-----
 sources             |  4 ++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 3e78e86..b6f3ada 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -77,3 +77,6 @@ NetworkManager-0.7.0.svn3437.tar.gz
 nm-applet-0.7.0.svn591.tar.gz
 NetworkManager-0.7.0.svn3440.tar.gz
 nm-applet-0.7.0.svn592.tar.gz
+NetworkManager-0.7.0.svn3472.tar.gz
+nm-applet-0.7.0.svn602.tar.gz
+nm-applet-0.7.0.svn603.tar.gz
diff --git a/NetworkManager.spec b/NetworkManager.spec
index f3b6a06..49059e4 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,9 +7,10 @@ ExcludeArch: s390 s390x
 %define gtk2_version	2.12.0
 %define wireless_tools_version 1:28-0pre9
 %define libnl_version 1.0-0.15.pre8.git20071218
+%define ppp_version 2.2.4
 
-%define snapshot svn3440
-%define applet_snapshot svn592
+%define snapshot svn3472
+%define applet_snapshot svn603
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -28,7 +29,6 @@ Patch3: no-strict-aliasing.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
-Requires: wireless-tools >= %{wireless_tools_version}
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: hal >= %{hal_version}
@@ -37,7 +37,7 @@ Requires: dhclient >= 3.0.2-12
 Requires: wpa_supplicant >= 0.5.7-21
 Requires: libnl >= %{libnl_version}
 Requires: %{name}-glib = %{epoch}:%{version}-%{release}
-Requires: ppp >= 2.4.4
+Requires: ppp >= %{ppp_version}
 Obsoletes: dhcdbd
 
 BuildRequires: dbus-devel >= %{dbus_version}
@@ -58,7 +58,7 @@ BuildRequires: libnl-devel >= %{libnl_version}
 BuildRequires: libnotify-devel >= 0.3
 BuildRequires: perl(XML::Parser)
 BuildRequires: automake autoconf intltool libtool
-BuildRequires: ppp-devel >= 2.4.4
+BuildRequires: ppp-devel >= %{ppp_version}
 BuildRequires: nss-devel >= 3.11.7
 
 %description
@@ -279,6 +279,11 @@ fi
 
 
 %changelog
+* Tue Mar 18 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.1.svn3472
+- Fix crashes on suspend/resume and exit (rh #437426)
+- Ensure there's always an option to chose the wired device
+- Never set default route via an IPv4 link-local addressed device (rh #437338)
+
 * Wed Mar 12 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.1.svn3440
 - Fix DHCP rebind behavior
 - Preliminary PPPoE support
diff --git a/sources b/sources
index 17a77cc..0f90d4d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-be28c35b9dedeacb5b8ce02a2058933a  NetworkManager-0.7.0.svn3440.tar.gz
-f85ea0e7b7620ff8306cac7069b24b55  nm-applet-0.7.0.svn592.tar.gz
+1cdd2194cffdb64518322f91fe7b7a72  NetworkManager-0.7.0.svn3472.tar.gz
+d093c88645cb1c6558b938688f05060f  nm-applet-0.7.0.svn603.tar.gz