rpms/lyx/FC-4 lyx-1.4.0-boost.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 lyx.spec, 1.18, 1.19 sources, 1.6, 1.7

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/lyx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18166

Modified Files:
	.cvsignore lyx.spec sources 
Added Files:
	lyx-1.4.0-boost.patch 
Log Message:
* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-2
- 1.4.1


lyx-1.4.0-boost.patch:

--- NEW FILE lyx-1.4.0-boost.patch ---
--- 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/regex.hpp>
+#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-14 08:55:14.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/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-14 08:55:14.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
--- 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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Mar 2006 18:51:26 -0000	1.4
+++ .cvsignore	11 Apr 2006 15:53:34 -0000	1.5
@@ -1,2 +1,2 @@
-lyx-1.4.0.tar.bz2
 beamer.layout
+lyx-1.4.1.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lyx.spec	30 Mar 2006 19:17:52 -0000	1.18
+++ lyx.spec	11 Apr 2006 15:53:34 -0000	1.19
@@ -1,8 +1,8 @@
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.4.0
-Release: 5%{?dist}
+Version: 1.4.1
+Release: 2%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Patch1: lyx-1.4.0-helpers.patch
+Patch2: lyx-1.4.0-boost.patch
 
 # app-wrapper for various frontends
 Source10: lyx.sh
@@ -38,6 +39,7 @@
 BuildRequires: zlib-devel
 BuildRequires: tetex-latex
 BuildRequires: tetex-fonts
+%{?_without_included_boost:BuildRequires: boost-devel >= 1.33.0}
 
 # For texhash
 Requires(post): tetex-fonts
@@ -91,6 +93,7 @@
 %setup -q -n %{name}-%{version}%{?beta}
 
 %patch1 -p1 -b .helpers
+%{?_without_included_boost:%patch2 -p1 -b .boost}
 
 
 %build
@@ -111,6 +114,7 @@
   --enable-optimization="%{optflags}" \
   --with-aiksaurus \
   --with-aspell \
+  %{?_without_included_boost} \
   --without-warnings --disable-dependency-tracking \
   --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks 
 
@@ -195,6 +199,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-2
+- 1.4.1
+
 * Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-5
 - %%trigger ImageMagick (#186319)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Mar 2006 18:51:26 -0000	1.6
+++ sources	11 Apr 2006 15:53:34 -0000	1.7
@@ -1,2 +1,2 @@
-5ab37471339ff7dbc8f0c43282746cb0  lyx-1.4.0.tar.bz2
 c906271900a0627d3df2a38ad962a285  beamer.layout
+368696695a05e428773626e3b0f8ae74  lyx-1.4.1.tar.bz2