From 9efbf2f7c360b04337f66d2964d0733474dba53a Mon Sep 17 00:00:00 2001
From: Balint Cristian <rezso@fedoraproject.org>
Date: Sun, 25 May 2008 12:57:55 +0000
Subject: [PATCH] try further fix sed behaviour

---
 gdal.spec | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gdal.spec b/gdal.spec
index d9f8bc2..25101bc 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -141,8 +141,8 @@ export CPPFLAGS="$CPPFLAGS `dap-config --cflags`"
 export CPPFLAGS="$CPPFLAGS -DH5_USE_16_API"
 
 # code may contain sensible buffer overflows triggered by gcc ssp flag (mustfixupstream).
-export CXXFLAGS=`echo %{optflags}|sed -e 's/\-Wp\,-D_FORTIFY_SOURCE\=2 / /g'`
-export CFLAGS=`echo %{optflags}|sed -e 's/\-Wp\,\-D_FORTIFY_SOURCE\=2 / /g'`
+export CXXFLAGS=`echo %{optflags}|sed -e 's/-Wp,-D_FORTIFY_SOURCE=2 / /g'`
+export CFLAGS=`echo %{optflags}|sed -e 's/-Wp,-D_FORTIFY_SOURCE=2 / /g'`
 
 # we have multilib ogdi-config
 %if "%{_lib}" == "lib"
@@ -190,12 +190,12 @@ export CFLAGS=`echo %{optflags}|sed -e 's/\-Wp\,\-D_FORTIFY_SOURCE\=2 / /g'`
 
 # fixup hardcoded wrong compile flags.
 cp GDALmake.opt GDALmake.opt.orig
-sed -e "s/^CFLAGS.*$/CFLAGS=$CFLAGS/" \
--e "s/^CXXFLAGS.*$/CXXFLAGS=$CXXFLAGS/" \
--e "s/^FFLAGS.*$/FFLAGS=$FFLAGS/" \
--e "s/ cfitsio / /" \
--e "s/-ldap++/-ldap -ldapclient -ldapserver/" \
--e "s/-L\$(INST_LIB) -lgdal/-lgdal/" \
+sed -e 's/^CFLAGS.*\$/CFLAGS=$CFLAGS/' \
+-e 's/^CXXFLAGS.*\$/CXXFLAGS=$CXXFLAGS/' \
+-e 's/^FFLAGS.*\$/FFLAGS=$FFLAGS/' \
+-e 's/ cfitsio / /' \
+-e 's/-ldap++/-ldap -ldapclient -ldapserver/' \
+-e 's/-L\$(INST_LIB) -lgdal/-lgdal/' \
 GDALmake.opt.orig > GDALmake.opt
 rm GDALmake.opt.orig