rpms/lyx/devel lyx-1.4.0pre5-boost.patch, NONE, 1.1 lyx.spec, 1.19, 1.20

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	lyx.spec 
Added Files:
	lyx-1.4.0pre5-boost.patch 
Log Message:
* Mon Feb 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.6.pre5
- --without-included-boost
- BR: boost-devel


lyx-1.4.0pre5-boost.patch:

--- NEW FILE lyx-1.4.0pre5-boost.patch ---
--- 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 @@
 
 #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>
 
--- 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
@@ -10,7 +10,12 @@
 #include <boost/shared_ptr.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/utility.hpp>
 
--- 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
@@ -14,7 +14,12 @@
 
 #include <iostream>
 
+#include <boost/version.hpp>
+#if (BOOST_VERSION >= 103300)
+#include <boost/test/utils/nullstream.hpp>
+#else
 #include <boost/test/detail/nullstream.hpp>
+#endif
 
 #ifdef DEBUG
 # define TEMPORARY_DEBUG_MACRO DEBUG


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- lyx.spec	13 Feb 2006 16:15:28 -0000	1.19
+++ lyx.spec	13 Feb 2006 18:21:37 -0000	1.20
@@ -4,7 +4,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.0
-Release: 0.5.%{beta}%{?dist}
+Release: 0.6.%{beta}%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -13,6 +13,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Patch1: lyx-1.4.0-helpers.patch
+Patch2: lyx-1.4.0pre5-boost.patch
 
 # app-wrapper for various frontends
 Source10: lyx.sh
@@ -40,6 +41,7 @@
 BuildRequires: zlib-devel
 BuildRequires: tetex-latex
 BuildRequires: tetex-fonts
+BuildRequires: boost-devel
 
 # For texhash
 Requires(post): tetex-fonts
@@ -93,6 +95,7 @@
 %setup -q -n %{name}-%{version}%{?beta}
 
 %patch1 -p1 -b .helpers
+%patch2 -p2 -b .boost
 
 # ./autogen.sh
 
@@ -112,6 +115,7 @@
   --enable-optimization="$RPM_OPT_FLAGS" \
   --with-aiksaurus \
   --with-aspell \
+  --without-included-boost \
   --without-warnings --disable-debug --disable-dependency-tracking
 
 # Intermediate cleanup
@@ -198,6 +202,10 @@
 
 
 %changelog
+* Mon Feb 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.6.pre5
+- --without-included-boost
+- BR: boost-devel
+
 * Mon Feb 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.5.pre5
 - 1.4.0pre5