From 1a2316dc701e9cb2fc49e0908a65d5fa260bd264 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Aug 10 2012 08:58:07 +0000
Subject: 3.8.0-1


---

diff --git a/valgrind.spec b/valgrind.spec
index a828dd1..22ee582 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -117,9 +117,8 @@ ar r libgcc/32/libgcc_s.a
 ar r libgcc/libgcc_s_32.a
 CC="gcc -B `pwd`/libgcc/"
 %endif
-%configure CC="$CC" \
-  CFLAGS="`echo " %{optflags} " | sed 's/ -m\(64\|3[21]\) / /g;s/ \(-fexceptions\|-fstack-protector\|-Wp,-D_FORTIFY_SOURCE=2\) / /g;s/^ //;s/ $//'`" \
-  CXXFLAGS="`echo " %{optflags} " | sed 's/ -m\(64\|3[21]\) / /g;s/ \(-fexceptions\|-fstack-protector\|-Wp,-D_FORTIFY_SOURCE=2\) / /g;s/^ //;s/ $//'`" \
+OPTFLAGS="`echo " %{optflags} " | sed 's/ -m\(64\|3[21]\) / /g;s/ -fexceptions / /g;s/ -fstack-protector / / g;s/ -Wp,-D_FORTIFY_SOURCE=2 / /g;s/^ //;s/ $//'`"
+%configure CC="$CC" CFLAGS="$OPTFLAGS" CXXFLAGS="$OPTFLAGS" \
 %ifarch %{ix86} x86_64 ppc ppc64
   --with-mpicc=%{_libdir}/openmpi/bin/mpicc \
 %endif