[NetworkManager/f17] new git snapshot; fixes rh #809123

[Jirka Klimes]

commit a9fc6b0cd9d40585683d38a3c28fadcfe510e911
Author: Jiří Klimeš <jklimes at redhat.com>
Date:   Wed Apr 4 08:51:29 2012 +0200

    new git snapshot; fixes rh #809123

 .gitignore                   |    2 +
 NetworkManager.spec          |   13 +-
 nm-applet-detect-shell.patch |  471 ------------------------------------------
 sources                      |    4 +-
 4 files changed, 11 insertions(+), 479 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e47cd6c..28a2355 100644
--- a/.gitignore
+++ b/.gitignore
@@ -281,3 +281,5 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-0.9.4.0.git20120328.tar.bz2
 /network-manager-applet-0.9.4.1.git20120328.tar.bz2
 /network-manager-applet-0.9.4.0.git20120328.tar.bz2
+/network-manager-applet-0.9.4.0.git20120403.tar.bz2
+/NetworkManager-0.9.4.0.git20120403.tar.bz2
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 040e702..ea01c5b 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,8 +7,8 @@
 %define libnl3_version 3.2.6
 %define ppp_version 2.4.5
 
-%define snapshot .git20120328
-%define applet_snapshot .git20120328
+%define snapshot .git20120403
+%define applet_snapshot .git20120403
 %define realversion 0.9.4.0
 
 %if 0%{?fedora} < 17
@@ -20,8 +20,8 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
-Version: 0.9.4.0
-Release: 2%{snapshot}%{?dist}
+Version: 0.9.4
+Release: 3%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -36,7 +36,6 @@ Patch4: nm-polkit-permissive.patch
 Patch5: nm-applet-wifi-dialog-ui-fixes.patch
 Patch6: nss-error.patch
 Patch7: applet-ignore-deprecated.patch
-Patch8: nm-applet-detect-shell.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): chkconfig
@@ -219,7 +218,6 @@ tar -xjf %{SOURCE1}
 %patch5 -p1 -b .applet-wifi-ui
 %patch6 -p1 -b .nss-error
 %patch7 -p1 -b .no-deprecated
-%patch8 -p1 -b .detect-shell
 
 %build
 
@@ -495,6 +493,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/libnm-gtk.so
 
 %changelog
+* Wed Apr  4 2012 Jiří Klimeš <jklimes at redhat.com> - 0.9.4-3.git20120403
+-libnm-glib: initialize GError, else NMRemoteSettings crash can occur (rh #809123)
+
 * Mon Apr  2 2012 Dan Winship <danw at redhat.com> - 0.9.4.0-2.git20120328
 - Fix gnome-shell detection in nm-applet
 
diff --git a/sources b/sources
index 522360b..e4b5d85 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-019977d861ff17aa7a51a5393ef8d218  NetworkManager-0.9.4.0.git20120328.tar.bz2
-042b3c02f087e44d9ca11ed7a2172a41  network-manager-applet-0.9.4.0.git20120328.tar.bz2
+0543720384c49c6ffce4055192806447  network-manager-applet-0.9.4.0.git20120403.tar.bz2
+09917aea8a8ef0fc6c04b281be4f9e3a  NetworkManager-0.9.4.0.git20120403.tar.bz2