Update to new pre-0.9.8.2 snapshot

NetworkManager.spec

@@ -6,7 +6,7 @@
 %define libnl3_version 3.2.7
 %define ppp_version 2.4.5
 
-%define snapshot .git20130327
+%define snapshot .git20130507
 %define realversion 0.9.8.1
 
 %if 0%{?fedora} && 0%{?fedora} < 17
@@ -15,11 +15,15 @@
 %define systemd_dir %{_prefix}/lib/systemd/system
 %endif
 
+# gtk-doc conflicts with hardened build even with the patch, disable
+# until redhat-rpm-config is fixed: https://bugzilla.redhat.com/show_bug.cgi?id=892837
+#global _hardened_build 1
+
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.9.8.1
-Release: 1%{snapshot}%{?dist}
+Release: 2%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -27,7 +31,7 @@ URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{realversion}%{snapshot}.tar.bz2
 Source1: NetworkManager.conf
 Patch1: explain-dns1-dns2.patch
-Patch2: nss-error.patch
+Patch2: rh853199-fix-gtk-doc-hardened-build.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -154,7 +158,6 @@ NetworkManager functionality from applications that use glib.
 %setup -q -n NetworkManager-%{realversion}
 
 %patch1 -p1 -b .explain-dns1-dns2
-%patch2 -p1 -b .nss-error
 
 %build
 
@@ -185,6 +188,9 @@ intltoolize --force
 	--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
 	--with-dist-version=%{version}-%{release}
 
+# Patch here because gtk-doc.make is generated
+patch -p1 -b -z .gtkdoc-hardened-build < %{PATCH2}
+
 make %{?_smp_mflags}
 
 %install
@@ -358,6 +364,19 @@ exit 0
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Tue May  7 2013 Dan Williams <dcbw@redhat.com> - 0.9.8.1-2.git20130507
+- core: fix issue with UI not showing disconnected on rfkill
+- core: memory leak fixes
+- core: silence warning about failure reading permanent MAC address (rh #907912)
+- core: wait up to 120s for slow-connecting modems
+- core: don't crash on PPPoE connections without a wired setting
+- core: ensure the AvailableConnections property is always correct
+- keyfile: ensure all-default VLAN connections are read correctly
+- core: suppress kernel's automatic creation of bond0 (rh #953466)
+- libnm-glib: make NMSecretAgent usable with GObject Introspection
+- libnm-util: fix GObject Introspection annotations of nm_connection_need_secrets()
+- core: documentation updates
+
 * Wed Mar 27 2013 Dan Williams <dcbw@redhat.com> - 0.9.8.1-1.git20130327
 - Update to 0.9.8.2 snapshot
 - core: fix VLAN parent handling when identified by UUID

nss-error.patch

@@ -1,15 +0,0 @@
-diff -up NetworkManager-0.9.2.0/libnm-util/crypto_nss.c.foo NetworkManager-0.9.2.0/libnm-util/crypto_nss.c
---- NetworkManager-0.9.2.0/libnm-util/crypto_nss.c.foo	2011-11-10 12:40:14.365009479 -0600
-+++ NetworkManager-0.9.2.0/libnm-util/crypto_nss.c	2011-11-10 12:40:48.787579140 -0600
-@@ -26,6 +26,11 @@
- #include <glib.h>
- #include <glib/gi18n.h>
- 
-+/* Work around NSS error:
-+ * /usr/include/nss3/pkcs11n.h:365:26: error: "__GNUC_MINOR" is not defined [-Werror=undef]
-+ */
-+#define __GNUC_MINOR __GNUC_MINOR__
-+
- #include <prinit.h>
- #include <nss.h>
- #include <pk11pub.h>

rh853199-fix-gtk-doc-hardened-build.patch

@@ -0,0 +1,11 @@
+--- NetworkManager-0.9.8.1/gtk-doc.make	2013-04-30 15:16:13.049980141 -0500
++++ NetworkManager-0.9.8.1/gtk-doc.make	2013-04-30 15:17:41.525874040 -0500
+@@ -108,7 +108,7 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_
+ 	            scanobj_options="--verbose"; \
+ 	        fi; \
+ 	    fi; \
+-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
++	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" \
+ 	    gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
+ 	else \
+ 	    for i in $(SCANOBJ_FILES) ; do \

sources

@@ -1 +1 @@
-5b672fc0932992b4c178db363d9a6f8d  NetworkManager-0.9.8.1.git20130327.tar.bz2
+e2cdc55cda2d2b3967fb020524505d16  NetworkManager-0.9.8.1.git20130507.tar.bz2