From a6e2fe350bfbfe82bc2b328001c4fc51c7fadc99 Mon Sep 17 00:00:00 2001
From: Daniel Williams <dcbw@fedoraproject.org>
Date: Fri, 21 Sep 2007 18:50:07 +0000
Subject: [PATCH] - New snapshot

---
 .cvsignore                                  | 1 +
 NetworkManager-0.7.0-missing-includes.patch | 9 ---------
 NetworkManager.spec                         | 8 +++++---
 sources                                     | 2 +-
 4 files changed, 7 insertions(+), 13 deletions(-)
 delete mode 100644 NetworkManager-0.7.0-missing-includes.patch

diff --git a/.cvsignore b/.cvsignore
index a4fd255..eb0d792 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -6,3 +6,4 @@ NetworkManager-0.7.0.svn2833.tar.gz
 nm-applet-0.7.0.svn186.tar.gz
 NetworkManager-0.7.0.svn2844.tar.gz
 nm-applet-0.7.0.svn190.tar.gz
+NetworkManager-0.7.0.svn2849.tar.gz
diff --git a/NetworkManager-0.7.0-missing-includes.patch b/NetworkManager-0.7.0-missing-includes.patch
deleted file mode 100644
index 2640228..0000000
--- a/NetworkManager-0.7.0-missing-includes.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -up NetworkManager-0.7.0/test/Makefile.am.missing-includes NetworkManager-0.7.0/test/Makefile.am
---- NetworkManager-0.7.0/test/Makefile.am.missing-includes	2007-09-13 07:43:42.000000000 -0400
-+++ NetworkManager-0.7.0/test/Makefile.am	2007-09-20 09:08:57.000000000 -0400
-@@ -38,5 +38,3 @@ libnm_glib_test_LDADD =	$(DBUS_LIBS) $(G
- 			$(top_builddir)/libnm-glib/libnm_glib.la \
- 			$(top_builddir)/libnm-util/libnm-util.la
- 
--nm_supplicant_test_SOURCES = nm-supplicant-test.c
--nm_supplicant_test_LDADD = $(GLIB_LIBS) $(GTHREAD_LIBS)
diff --git a/NetworkManager.spec b/NetworkManager.spec
index d4f8b4c..4c98c19 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,7 +7,7 @@ ExcludeArch: s390 s390x
 %define gtk2_version	2.10.0
 %define wireless_tools_version 1:28-0pre9
 
-%define snapshot svn2844
+%define snapshot svn2849
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -20,7 +20,6 @@ URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}.%{snapshot}.tar.gz
 Source1: nm-applet-%{version}.svn190.tar.gz
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
-Patch2: NetworkManager-0.7.0-missing-includes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -31,6 +30,7 @@ Requires: hal >= %{hal_version}
 Requires: iproute openssl
 Requires: dhclient >= 3.0.2-12
 Requires: wpa_supplicant >= 0.5.7-7
+Obsoletes: dhcdbd
 
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -119,7 +119,6 @@ NetworkManager functionality from applications that use glib.
 
 %prep
 %setup -q
-%patch2 -p1 -b .missing-includes
 
 # unpack the applet
 tar -xzf %{SOURCE1}
@@ -259,6 +258,9 @@ fi
 
 
 %changelog
+* Fri Sep 21 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn2849
+- New snapshot
+
 * Fri Sep 21 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn2844
 - New snapshot
 
diff --git a/sources b/sources
index 640d295..677e36a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f30eb054387f0a7efb2fdda7ed43c8a9  NetworkManager-0.7.0.svn2844.tar.gz
 bf544bfb69e664202d509fbe028cb968  nm-applet-0.7.0.svn190.tar.gz
+abba317b083a742b1a36167c16654a3a  NetworkManager-0.7.0.svn2849.tar.gz