rpms/lyx/devel lyx.spec,1.29,1.30

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4315

Modified Files:
	lyx.spec 
Log Message:
* Thu Mar 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-4
- fix stripping of -fexceptions from %optflags



Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- lyx.spec	8 Mar 2006 19:45:52 -0000	1.29
+++ lyx.spec	9 Mar 2006 16:15:37 -0000	1.30
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -99,10 +99,10 @@
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
-# drop -fexceptions from RPM_OPT_FLAGS, suggested by lyx devs:
+# drop -fexceptions from optflags, suggested by lyx devs:
 # http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg85794.html
-export CFLAGS="$(echo %optflags | sed -e 's|-fexceptions||' )"
-export CXXFLAGS="$(echo %optflags | sed -e 's|-fexceptions||' )"
+optflags="$(echo %optflags | sed -e 's|-fexceptions||' )"
+%global optflags $optflags
 
 for frontend in qt xforms ; do
 
@@ -110,7 +110,7 @@
   --disable-rpath \
   --enable-compression-support \
   --with-frontend=$frontend \
-  --enable-optimization="$RPM_OPT_FLAGS" \
+  --enable-optimization="%{optflags}" \
   --with-aiksaurus \
   --with-aspell \
   --without-warnings --disable-dependency-tracking \
@@ -203,6 +203,9 @@
 
 
 %changelog
+* Thu Mar 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-4
+- fix stripping of -fexceptions from %%optflags
+
 * Wed Mar 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-3
 - include beamer.layout