rpms/gdal/devel gdal.spec,1.39,1.40

[Balint Cristian (rezso)]

Author: rezso

Update of /cvs/pkgs/rpms/gdal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3638

Modified Files:
	gdal.spec 
Log Message:
try further fix sed behaviour



Index: gdal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/devel/gdal.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gdal.spec	25 May 2008 11:58:39 -0000	1.39
+++ gdal.spec	25 May 2008 12:57:55 -0000	1.40
@@ -141,8 +141,8 @@
 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 @@
 
 # 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