rpms/lyx/devel lyx-1.4.0pre5-boost.patch, 1.1, 1.2 lyx.spec, 1.21, 1.22

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	lyx-1.4.0pre5-boost.patch lyx.spec 
Log Message:
* Tue Feb 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.9.pre5
- updated boost patch
- drop -fexceptions from %optflags


lyx-1.4.0pre5-boost.patch:

Index: lyx-1.4.0pre5-boost.patch
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx-1.4.0pre5-boost.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-1.4.0pre5-boost.patch	13 Feb 2006 18:21:37 -0000	1.1
+++ lyx-1.4.0pre5-boost.patch	14 Feb 2006 20:50:11 -0000	1.2
@@ -1,36 +1,15 @@
---- lyx-1.4.0pre5/src/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
-+++ lyx-1.4.0pre5/src/pch.h	2006-02-13 11:46:38.000000000 -0600
-@@ -17,7 +17,12 @@
- #include <boost/signals/connection.hpp>
- #include <boost/signal.hpp>
- #include <boost/signals/trackable.hpp>
-+#include <boost/version.hpp>
-+#if (BOOST_VERSION >= 103300)
-+#include <boost/test/utils/nullstream.hpp>
-+#else
- #include <boost/test/detail/nullstream.hpp>
-+#endif
- #include <boost/tokenizer.hpp>
- #include <boost/tuple/tuple.hpp>
- #include <boost/utility.hpp>
---- lyx-1.4.0pre5/src/support/filetools.C.boost	2005-09-07 04:44:58.000000000 -0500
-+++ lyx-1.4.0pre5/src/support/filetools.C	2006-02-13 11:55:22.000000000 -0600
-@@ -38,7 +38,13 @@
+--- lyx-1.4.0pre5/src/frontends/controllers/biblio.C.boost	2005-03-21 08:31:22.000000000 -0600
++++ lyx-1.4.0pre5/src/frontends/controllers/biblio.C	2006-02-14 08:59:29.000000000 -0600
+@@ -20,6 +20,7 @@
+ #include "support/lstrings.h"
  
- #include <boost/assert.hpp>
- #include <boost/filesystem/operations.hpp>
-+// Not sure about this one (?) -- Rex
-+#include <boost/version.hpp>
-+#if (BOOST_VERSION >= 103300)
-+#include <boost/cregex.hpp>
-+#else
  #include <boost/regex.hpp>
-+#endif
- 
- #include <fcntl.h>
++#include <boost/cregex.hpp>
  
+ #include <algorithm>
+ #include <sstream>
 --- lyx-1.4.0pre5/src/support/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
-+++ lyx-1.4.0pre5/src/support/pch.h	2006-02-13 11:50:33.000000000 -0600
++++ lyx-1.4.0pre5/src/support/pch.h	2006-02-14 08:55:14.000000000 -0600
 @@ -10,7 +10,12 @@
  #include <boost/shared_ptr.hpp>
  #include <boost/signal.hpp>
@@ -44,8 +23,18 @@
  #include <boost/tokenizer.hpp>
  #include <boost/utility.hpp>
  
+--- lyx-1.4.0pre5/src/support/filetools.C.boost	2005-09-07 04:44:58.000000000 -0500
++++ lyx-1.4.0pre5/src/support/filetools.C	2006-02-14 08:55:14.000000000 -0600
+@@ -39,6 +39,7 @@
+ #include <boost/assert.hpp>
+ #include <boost/filesystem/operations.hpp>
+ #include <boost/regex.hpp>
++#include <boost/cregex.hpp>
+ 
+ #include <fcntl.h>
+ 
 --- lyx-1.4.0pre5/src/support/debugstream.h.boost	2004-05-20 04:35:30.000000000 -0500
-+++ lyx-1.4.0pre5/src/support/debugstream.h	2006-02-13 11:47:16.000000000 -0600
++++ lyx-1.4.0pre5/src/support/debugstream.h	2006-02-14 08:55:14.000000000 -0600
 @@ -14,7 +14,12 @@
  
  #include <iostream>
@@ -59,3 +48,18 @@
  
  #ifdef DEBUG
  # define TEMPORARY_DEBUG_MACRO DEBUG
+--- lyx-1.4.0pre5/src/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
++++ lyx-1.4.0pre5/src/pch.h	2006-02-14 08:55:14.000000000 -0600
+@@ -17,7 +17,12 @@
+ #include <boost/signals/connection.hpp>
+ #include <boost/signal.hpp>
+ #include <boost/signals/trackable.hpp>
++#include <boost/version.hpp>
++#if (BOOST_VERSION >= 103300)
++#include <boost/test/utils/nullstream.hpp>
++#else
+ #include <boost/test/detail/nullstream.hpp>
++#endif
+ #include <boost/tokenizer.hpp>
+ #include <boost/tuple/tuple.hpp>
+ #include <boost/utility.hpp>


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- lyx.spec	13 Feb 2006 18:43:58 -0000	1.21
+++ lyx.spec	14 Feb 2006 20:50:11 -0000	1.22
@@ -4,7 +4,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.0
-Release: 0.7.%{beta}%{?dist}
+Release: 0.9.%{beta}%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -106,6 +106,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)
+export CFLAGS="$(echo %optflags | sed -e 's|-fexceptions||' )"
+export CXXFLAGS="$(echo %optflags | sed -e 's|-fexceptions||' )"
+
 for frontend in qt xforms ; do
 
 %configure \
@@ -202,6 +206,10 @@
 
 
 %changelog
+* Tue Feb 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.9.pre5
+- updated boost patch
+- drop -fexceptions from %%optflags
+
 * Mon Feb 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.7.pre5
 - --without-included-boost
 - BR: boost-devel