From 029921f8a966758d25e9a61b6cb2c82fb5b7a702 Mon Sep 17 00:00:00 2001
From: Daniel Williams <dcbw@fedoraproject.org>
Date: Fri, 12 Feb 2010 07:31:37 +0000
Subject: [PATCH] - core: fix mobile broadband PIN handling (rh #543088) (rh
 #560742) - core: better handling of /etc/hosts if hostname was already added
 by the     user - applet: crash less on D-Bus property errors (rh #557007) -
 applet: fix crash entering wired 802.1x connection details (rh #556763)

---
 .cvsignore                          |  3 +++
 NetworkManager.spec                 | 22 ++++++++++++++--------
 nm-applet-internal-buildfixes.patch | 11 +++++------
 sources                             |  6 +++---
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index edc8542..57430d2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -183,3 +183,6 @@ nmcli-git20100122.tar.bz2
 NetworkManager-0.7.999.git20100129.tar.bz2
 network-manager-applet-0.7.999.git20100129.tar.bz2
 nmcli-git20100129.tar.bz2
+NetworkManager-0.7.999.git20100211.tar.bz2
+network-manager-applet-0.7.999.git20100211.tar.bz2
+nmcli-git20100211.tar.bz2
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 7b469ab..6309a88 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -9,16 +9,16 @@
 %define libnl_version 1.1
 %define ppp_version 2.4.5
 
-%define snapshot .git20100129
-%define applet_snapshot .git20100129
-%define nmcli_snapshot -git20100129
+%define snapshot .git20100211
+%define applet_snapshot .git20100211
+%define nmcli_snapshot -git20100211
 %define realversion 0.7.999
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.8.0
-Release: 0.3%{snapshot}%{?dist}
+Release: 0.4%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -389,11 +389,17 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Thu Feb 11 2010 Dan Williams <dcbw@redhat.com> - 0.8-0.4.git20100211
+- core: fix mobile broadband PIN handling (rh #543088) (rh #560742)
+- core: better handling of /etc/hosts if hostname was already added by the user
+- applet: crash less on D-Bus property errors (rh #557007)
+- applet: fix crash entering wired 802.1x connection details (rh #556763)
+
 * Tue Feb 09 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 0.8-0.3.git20100129
-- don't autostart in KDE on F13+ (#541353)
-- validate the autostart .desktop file
-- fix nmcli-build.patch hack for the stricter ld (fixes FTBFS)
-- fix nm-connection-editor for the stricter ld, need -lm (fixes FTBFS)
+- core: validate the autostart .desktop file
+- build: fix nmcli for the stricter ld (fixes FTBFS)
+- build: fix nm-connection-editor for the stricter ld (fixes FTBFS)
+- applet: don't autostart in KDE on F13+ (#541353)
 
 * Fri Jan 29 2010 Dan Williams <dcbw@redhat.com> - 0.8-0.2.git20100129
 - core: add Bluetooth Dial-Up Networking (DUN) support (rh #136663)
diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch
index ad9879e..83e8d0a 100644
--- a/nm-applet-internal-buildfixes.patch
+++ b/nm-applet-internal-buildfixes.patch
@@ -36,16 +36,15 @@ diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/connection-ed
  nm_connection_editor_CPPFLAGS = \
  	$(NMA_CFLAGS) \
  	-DICONDIR=\""$(datadir)/icons"\" \
-@@ -63,7 +67,11 @@ nm_connection_editor_LDADD = \
- 	${top_builddir}/src/wireless-security/libwireless-security.la \
+@@ -63,7 +67,10 @@ nm_connection_editor_LDADD = \
  	${top_builddir}/src/utils/libutils.la \
  	${top_builddir}/src/marshallers/libmarshallers.la \
--	$(NMA_LIBS)
-+	$(NMA_LIBS) \
+ 	$(NMA_LIBS) \
+-	-lm
++	-lm \
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la \
-+	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib-vpn.la \
-+	-lm
++	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib-vpn.la
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = \
diff --git a/sources b/sources
index 754f709..7a50191 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-9393afeae87158a4dcad6fbab7dbb343  NetworkManager-0.7.999.git20100129.tar.bz2
-f710c8a1f7f0f1bd7452f8f3138c41b7  network-manager-applet-0.7.999.git20100129.tar.bz2
-193bc3c411f4324c446bc0b9a6b48c67  nmcli-git20100129.tar.bz2
+b80c04c5e10b0d1dae5b76efa39ca65b  NetworkManager-0.7.999.git20100211.tar.bz2
+76577af2ffd1a70b5ddd7879a845ca6b  network-manager-applet-0.7.999.git20100211.tar.bz2
+6e0d95a40d197a4c5afa920ea6ad4ea7  nmcli-git20100211.tar.bz2