From ded130c1dd5a1c1aa16f3c18fb41211184a993a4 Mon Sep 17 00:00:00 2001
From: Elliot Lee <sopwith@redhat.com>
Date: Mar 23 2005 20:05:40 +0000
Subject: new version


---

diff --git a/macros b/macros
index c935b6a..9aa8269 100644
--- a/macros
+++ b/macros
@@ -151,7 +151,7 @@ unset DISPLAY\
 %__find_provides        /usr/lib/rpm/redhat/find-provides
 %__find_requires        /usr/lib/rpm/redhat/find-requires
 
-%__global_cflags	-O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2
+%__global_cflags	-O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions
 
 # Disable lookups
 %_hkp_keyserver  %{nil}
diff --git a/rpmrc b/rpmrc
index 74efe20..7aa67e1 100644
--- a/rpmrc
+++ b/rpmrc
@@ -1,12 +1,12 @@
 include: /usr/lib/rpm/rpmrc
 
-optflags: i386 %{__global_cflags} -m32 -march=i386 -mtune=pentium4 -fexceptions -fasynchronous-unwind-tables
-optflags: i486 %{__global_cflags} -m32 -march=i486 -fexceptions -fasynchronous-unwind-tables
-optflags: i586 %{__global_cflags} -m32 -march=i586 -fexceptions -fasynchronous-unwind-tables
-optflags: i686 %{__global_cflags} -m32 -march=i686 -mtune=pentium4 -fexceptions -fasynchronous-unwind-tables
-optflags: athlon %{__global_cflags} -m32 -march=athlon -fexceptions -fasynchronous-unwind-tables
+optflags: i386 %{__global_cflags} -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables
+optflags: i486 %{__global_cflags} -m32 -march=i486 -fasynchronous-unwind-tables
+optflags: i586 %{__global_cflags} -m32 -march=i586 -fasynchronous-unwind-tables
+optflags: i686 %{__global_cflags} -m32 -march=i686 -mtune=pentium4 -fasynchronous-unwind-tables
+optflags: athlon %{__global_cflags} -m32 -march=athlon -fasynchronous-unwind-tables
 optflags: ia64 %{__global_cflags}
-optflags: x86_64 %{__global_cflags} -m64 -march=nocona
+optflags: x86_64 %{__global_cflags} -m64 -mtune=nocona
 
 optflags: alpha %{__global_cflags} -mieee
 optflags: alphaev5 %{__global_cflags} -mieee -mcpu=ev5