[NetworkManager/f18] Update to 0.9.8.2 snapshot

[Daniel Williams]

commit b37ab2eeb1f0fb3045482a56832235d621bf7c94
Author: Dan Williams <dcbw at redhat.com>
Date:   Tue May 14 17:41:05 2013 -0500

    Update to 0.9.8.2 snapshot

 .gitignore          |    1 +
 NetworkManager.spec |   32 ++++++++++++++++++++++++--------
 nss-error.patch     |   15 ---------------
 sources             |    2 +-
 4 files changed, 26 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eabad57..3aef9a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -290,3 +290,4 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-0.9.8.0.tar.bz2
 /NetworkManager-0.9.8.1.git20130327.tar.bz2
 /NetworkManager-0.9.8.1.git20130430.tar.bz2
+/NetworkManager-0.9.8.1.git20130514.tar.bz2
diff --git a/NetworkManager.spec b/NetworkManager.spec
index bb0a1a7..c86e258 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -6,20 +6,25 @@
 %define libnl3_version 3.2.7
 %define ppp_version 2.4.5
 
-%define snapshot .git20130430
+%define snapshot .git20130514
 %define realversion 0.9.8.1
 
+%global regen_docs 0
+
 %if 0%{?fedora} && 0%{?fedora} < 17
 %define systemd_dir /lib/systemd/system
 %else
 %define systemd_dir %{_prefix}/lib/systemd/system
 %endif
 
+# NOTE! gtk-doc conflicts with hardened build: 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: 2%{snapshot}%{?dist}
+Release: 3%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -27,7 +32,6 @@ 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
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -76,7 +80,9 @@ BuildRequires: ppp-devel = %{ppp_version}
 BuildRequires: nss-devel >= 3.11.7
 BuildRequires: polkit-devel
 BuildRequires: dhclient
+%if %{regen_docs}
 BuildRequires: gtk-doc
+%endif
 BuildRequires: libudev-devel
 BuildRequires: libuuid-devel
 BuildRequires: libgudev1-devel >= 143
@@ -154,16 +160,17 @@ NetworkManager functionality from applications that use glib.
 %setup -q -n NetworkManager-%{realversion}
 
 %patch1 -p1 -b .explain-dns1-dns2
-%patch2 -p1 -b .nss-error
 
 %build
 
+%if %{regen_docs}
 # back up pristine docs and use them instead of generated ones, which make
 # multilib unhappy due to different timestamps in the generated content
 %{__cp} -R docs ORIG-docs
+%endif
 
-autopoint --force
-intltoolize --force
+#autopoint --force
+#intltoolize --force
 %configure \
 	--disable-static \
 	--with-dhclient=yes \
@@ -175,11 +182,13 @@ intltoolize --force
 %ifnarch s390 s390x
 	--enable-wimax=yes \
 %endif
+%if %{regen_docs}
+	--enable-gtk-doc \
+%endif
 	--enable-polkit=yes \
 	--enable-modify-system=yes \
 	--with-session-tracking=systemd \
 	--with-suspend-resume=systemd \
-	--with-docs=yes \
 	--with-system-ca-path=/etc/pki/tls/certs \
 	--with-tests=yes \
 	--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
@@ -216,9 +225,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 install -m 0755 test/.libs/nm-online %{buildroot}/%{_bindir}
 
+%if %{regen_docs}
 # install the pristine docs
 %{__cp} ORIG-docs/libnm-glib/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-glib/
 %{__cp} ORIG-docs/libnm-util/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-util/
+%endif
 
 mkdir -p $RPM_BUILD_ROOT%{systemd_dir}/remote-fs-pre.target.wants
 ln -s ../NetworkManager-wait-online.service $RPM_BUILD_ROOT%{systemd_dir}/remote-fs-pre.target.wants
@@ -358,7 +369,12 @@ exit 0
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
-* Tue Apr 30 2013 Dan Williams <dcbw at redhat.com> - 0.9.8.1-2.git20130430
+* Fri May 10 2013 Dan Williams <dcbw at redhat.com> - 0.9.8.1-3.git20130514
+- Enable hardened build
+- core: fix issue with buggy access points being removed from wifi scan list
+
+* Tue May  7 2013 Dan Williams <dcbw at 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
diff --git a/sources b/sources
index d9eb12a..e18d63b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6db9781298d03fa7fcd58f2ac5a0d7a5  NetworkManager-0.9.8.1.git20130430.tar.bz2
+f996eed84e3cf36bcdb6525727899477  NetworkManager-0.9.8.1.git20130514.tar.bz2