[freenx-server] Build everything with %{optflags}.

[Ville Skyttä]

commit 72c68e44f534924251d84908b4bb14088c381c9f
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Aug 17 10:29:12 2011 +0300

    Build everything with %{optflags}.

 freenx-server-0.7.3-optflags.patch |   24 ++++++++++++++++++++++++
 freenx-server.spec                 |    7 ++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/freenx-server-0.7.3-optflags.patch b/freenx-server-0.7.3-optflags.patch
new file mode 100644
index 0000000..176dbc0
--- /dev/null
+++ b/freenx-server-0.7.3-optflags.patch
@@ -0,0 +1,24 @@
+diff -up freenx-server-0.7.3/nxredir/Makefile~ freenx-server-0.7.3/nxredir/Makefile
+--- freenx-server-0.7.3/nxredir/Makefile~	2011-08-16 23:31:43.241133395 +0300
++++ freenx-server-0.7.3/nxredir/Makefile	2011-08-16 23:51:12.366784740 +0300
+@@ -1,7 +1,7 @@
+ all: libnxredir.so
+ 
+ CC=gcc
+-CFLAGS=-g -O2 -Wall -fPIC
++CFLAGS+=-fPIC
+ LIBNAME=libnxredir.so
+ VERSION=0
+ 
+diff -up freenx-server-0.7.3/nx-session-launcher/Makefile~ freenx-server-0.7.3/nx-session-launcher/Makefile
+--- freenx-server-0.7.3/nx-session-launcher/Makefile~	2008-08-05 20:54:32.000000000 +0300
++++ freenx-server-0.7.3/nx-session-launcher/Makefile	2011-08-16 23:50:59.680594597 +0300
+@@ -1,7 +1,7 @@
+ .PHONY: all install
+ 
+ CC=gcc
+-CFLAGS=-g -O2 -Wall -fPIC
++CFLAGS+=-fPIC
+ 
+ SOURCES = nx-session-launcher-suid.c
+ PROGRAMS = nx-session-launcher-suid
diff --git a/freenx-server.spec b/freenx-server.spec
index fad0b33..38ee14b 100644
--- a/freenx-server.spec
+++ b/freenx-server.spec
@@ -18,6 +18,7 @@ Patch1: freenx-server-r104-fixes.patch
 Patch2: restorecon.patch
 Patch3: freenx-server-0.7.3-nxpath-616993.patch
 Patch4: freenx-server-0.7.3-nxdialog-627010.patch
+Patch5: freenx-server-0.7.3-optflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: imake, redhat-release
 Requires: nx, %{_pkglibdir}
@@ -46,6 +47,7 @@ under the GPL. FreeNX-server is a GPL implementation of the NX Server.
 %patch2 -p0 -b .restorecon
 %patch3 -p1 -b .nxpath
 %patch4 -p1 -b .nxdialog
+%patch5 -p1 -b .optflags
 
 sed -i -e's,\$NX_DIR/bin,%{_pkglibexecdir},g'\
   -e's,\$NX_DIR/lib,%{_pkglibdir},g'\
@@ -54,7 +56,7 @@ sed -i -e's,^NX_LOGFILE=.*,NX_LOGFILE=/var/log/nx/nxserver.log,' \
   nxloadconfig
 
 %build
-CFLAGS="%{optflags}"; export CFLAGS
+export CFLAGS="%{optflags}" MODULE_CFLAGS="%{optflags}"
 make
 
 %install
@@ -131,6 +133,9 @@ fi
 %{_sysconfdir}/init.d/freenx-server
 
 %changelog
+* Wed Aug 17 2011 Ville Skyttä <ville.skytta at iki.fi>
+- Build everything with %%{optflags}.
+
 * Mon Jun 20 2011 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-22
 - Fix nxdialog when /usr/bin/dialog is available but xterm isn't (#627010).