[NetworkManager/f19] Enable hardened build

[Daniel Williams]

commit f070a9fd26707d6932c0cc0d0b4012b909c964a6
Author: Dan Williams <dcbw at redhat.com>
Date:   Fri May 17 12:06:33 2013 -0500

    Enable hardened build

 NetworkManager.spec                       |   33 ++++++++++++++++++----------
 rh853199-fix-gtk-doc-hardened-build.patch |   11 ---------
 sources                                   |    2 +-
 3 files changed, 22 insertions(+), 24 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index d75f975..c86e258 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -6,24 +6,25 @@
 %define libnl3_version 3.2.7
 %define ppp_version 2.4.5
 
-%define snapshot .git20130507
+%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
 
-# 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
+# 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/
@@ -31,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: rh853199-fix-gtk-doc-hardened-build.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -80,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
@@ -161,12 +163,14 @@ NetworkManager functionality from applications that use glib.
 
 %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 \
@@ -178,19 +182,18 @@ 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} \
 	--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
@@ -222,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
@@ -364,6 +369,10 @@ exit 0
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* 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
diff --git a/sources b/sources
index ea54fed..e18d63b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e2cdc55cda2d2b3967fb020524505d16  NetworkManager-0.9.8.1.git20130507.tar.bz2
+f996eed84e3cf36bcdb6525727899477  NetworkManager-0.9.8.1.git20130514.tar.bz2