rpms/gaim/devel gaim.spec,1.93,1.94

[fedora-cvs-commits redhat com]

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18661

Modified Files:
	gaim.spec 
Log Message:
FC5+ bash regex replace for -fstack-protector-all (mharris)



Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- gaim.spec	1 Aug 2005 00:31:27 -0000	1.93
+++ gaim.spec	2 Aug 2005 07:41:51 -0000	1.94
@@ -13,7 +13,7 @@
 
 Name:		gaim
 Version:	1.4.0
-Release:	5.fc5
+Release:	6.fc5
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -154,8 +154,7 @@
 %endif
 
 # FC5+ automatic -fstack-protector-all switch
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fstack-protector-all"
-export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | %{__sed} s/-fstack-protector/-fstack-protector-all/`
+export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
 # disable tcl and tk because nobody uses it
 # gnutls is buggy so use mozilla-nss on all distributions
 %configure --disable-tcl --disable-tk --enable-gnutls=no --enable-nss=yes $WITH_KRB $WITH_SILC $WITH_PERL
@@ -223,6 +222,9 @@
 %endif
 
 %changelog
+* Mon Aug  1 2005 Warren Togami <wtogami redhat com> 1:1.4.0-6
+- FC5+ bash regex replace for -fstack-protector-all (mharris)
+
 * Sun Jul 31 2005 Warren Togami <wtogami redhat com> 1:1.4.0-5
 - FC5+ automatic -fstack-protector-all switch
 - 150: MSN buddy names with space disconnect and profile corruption