[nx] Use system libXfont, add hardened build.

[Jon Ciesla]

commit e5f844423b8411719f5a0169d561ede0673d7895
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Oct 3 12:42:21 2012 -0500

    Use system libXfont, add hardened build.

 nx-3.5.0-syslibs.patch |   11 +++++++++++
 nx.spec                |    9 +++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/nx-3.5.0-syslibs.patch b/nx-3.5.0-syslibs.patch
index 9e7e68c..b686af7 100644
--- a/nx-3.5.0-syslibs.patch
+++ b/nx-3.5.0-syslibs.patch
@@ -17,3 +17,14 @@ diff -up nx-3.5.0/nx-X11/config/cf/host.def~ nx-3.5.0/nx-X11/config/cf/host.def
  
  /* 
   * To use a Expat library already installed outside the default search
+--- nx-3.5.0/nx-X11/config/cf/host.def~	2012-10-03 12:03:49.000000000 -0500
++++ nx-3.5.0/nx-X11/config/cf/host.def	2012-10-03 12:04:56.835159560 -0500
+@@ -647,7 +647,7 @@
+  * To link the X server with a dynamic version of the Xfont library,
+  * uncomment this.
+  *
+-#define XserverStaticFontLib	NO
++define XserverStaticFontLib	NO
+  */
+ 
+ /*
diff --git a/nx.spec b/nx.spec
index 40cf380..5ecaac3 100644
--- a/nx.spec
+++ b/nx.spec
@@ -1,3 +1,4 @@
+%global _hardened_build 1
 %define _pkglibdir %{_libdir}/nx
 %define _pkgdatadir %{_datadir}/nx
 %define _pkglibexecdir %{_libexecdir}/nx
@@ -5,7 +6,7 @@
 Summary: Proxy system for X11
 Name: nx
 Version: 3.5.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 # MIT on the X11 bits
 License: GPLv2 and MIT
 Group: Applications/Internet
@@ -36,7 +37,7 @@ BuildRequires: gcc-c++, libstdc++-devel, redhat-release, hardlink
 BuildRequires: expat-devel, audiofile-devel, openssl-devel, libjpeg-devel, libpng-devel
 BuildRequires: libXt-devel, xorg-x11-proto-devel, libXp-devel, imake
 BuildRequires: libXdamage-devel, libXrandr-devel, libXtst-devel
-BuildRequires: fontconfig-devel
+BuildRequires: fontconfig-devel, libXfont-devel
 # Better mention what we really require on a file basis.
 # Requires: xorg-x11-utils
 
@@ -154,6 +155,10 @@ rm -rf %{buildroot}
 %{_pkglibexecdir}
 
 %changelog
+* Wed Oct 03 2012 Jon Ciesla <limburgher at gmail.com> - 3.5.0-13
+- Use system libXfont, BZ 659557.
+- Add hardened build.
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.0-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild