From 47cdc62088dd2afa54c597e5bed0cf40aec05b6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Thu, 29 Mar 2018 15:46:01 +0200
Subject: [PATCH] - drop the -D_FORTIFY_SOURCE removal from preprocessor flags
 (#1560546)

---
 ogdi.spec | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ogdi.spec b/ogdi.spec
index e0b9380..af905a6 100644
--- a/ogdi.spec
+++ b/ogdi.spec
@@ -1,6 +1,6 @@
 Name:           ogdi
 Version:        3.2.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Open Geographic Datastore Interface
 Group:          Applications/Engineering
 License:        BSD
@@ -74,9 +74,9 @@ TOPDIR=`pwd`; TARGET=Linux; export TOPDIR TARGET
 INST_LIB=%{_libdir}/;export INST_LIB
 export CFG=debug # for -g
 
-# do not compile with ssp. it will trigger internal bugs (to_fix_upstream)
-OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g'`
-export CFLAGS="$OPT_FLAGS -fPIC -DPIC -DDONT_TD_VOID -DUSE_TERMIO"
+# removal of -D_FORTIFY_SOURCE from preprocessor flags seems not needed any more
+# ogdits-3.1 test suite produces same result with and without the flag
+export CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC -DDONT_TD_VOID -DUSE_TERMIO"
 %configure CPPFLAGS=-I/usr/include/tirpc \
         --with-binconfigs \
         --with-expat \
@@ -188,6 +188,9 @@ touch -r ogdi-config.in %{buildroot}%{_bindir}/%{name}-config
 
 
 %changelog
+* Thu Mar 29 2018 Dan Horák <dan[at]danny.cz> - 3.2.0-7
+- drop the -D_FORTIFY_SOURCE removal from preprocessor flags (#1560546)
+
 * Tue Mar 27 2018 Dan Horák <dan[at]danny.cz> - 3.2.0-6
 - fix incomplete compiler/linked flag injection (#1560546)