From aa3fa45612e53258fabd59e4c90ab41873dc31a5 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@fedoraproject.org>
Date: Mon, 31 Mar 2008 13:22:43 +0000
Subject: [PATCH] - fix compiler flags for FORTIFY_SOURCE

---
 x3270.spec | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/x3270.spec b/x3270.spec
index ebd820b..5003cde 100644
--- a/x3270.spec
+++ b/x3270.spec
@@ -8,7 +8,7 @@
 Summary: An X Window System based IBM 3278/3279 terminal emulator
 Name: x3270
 Version: 3.3.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: Applications/Internet
 URL: http://www.geocities.com/SiliconValley/Peaks/7814
@@ -80,24 +80,20 @@ Install the %{name}-text package if you need to access IBM hosts using an IBM
 %patch4 -p1
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 # Set LIBX3270DIR to something we can share with x3270-text
 perl -pi -e "s,LIBX3270DIR =.*,LIBX3270DIR = %{_datadir}/x3270,g" Imakefile.in
+# use rpmoptflags for x3270if
+perl -pi -e 's/ -o x3270if x3270if.c/ \$(CCOPTIONS) -o x3270if x3270if.c/g' Imakefile.in
 # Fix end of line encodings
 perl -pi -e "s/
//" html/Keymap.html html/Build.html
 libtoolize --copy --force
 %configure --prefix=%{_prefix}/ --with-fontdir=%{fontdir} --x-includes=/usr/include/X11 --x-libraries=/%{_libdir}/X11 --enable-app-defaults
-# Work around broken imake:
-echo 'makedepend "$@"' > gccmakedep
-chmod +x gccmakedep
-export PATH="$PATH:`pwd`"
 xmkmf
-#patch -p1 < %{PATCH5}
 make Makefiles
 make includes
 make depend
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} CCOPTIONS="$RPM_OPT_FLAGS"
 cd c3270-3.3
 autoconf
 libtoolize --copy --force
@@ -199,6 +195,9 @@ fi
 %{_mandir}/man1/c3270*
 
 %changelog
+* Thu Mar 20 2008 Karsten Hopp <karsten@redhat.com> 3.3.6-5
+- fix compiler flags for FORTIFY_SOURCE
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 3.3.6-4
 - Autorebuild for GCC 4.3