rpms/lyx/devel lyx.spec,1.22,1.23

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	lyx.spec 
Log Message:
avoid --without-included-boost on fc4/gcc-4.0.2



Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- lyx.spec	14 Feb 2006 20:50:11 -0000	1.22
+++ lyx.spec	14 Feb 2006 21:44:30 -0000	1.23
@@ -1,4 +1,9 @@
 
+## avoid on fc4/gcc-4.0.2, due to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24389
+%if "%{?fedora}" != "4"
+%define _without_included_boost --without-included-boost
+%endif
+
 %define beta pre5
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
@@ -41,7 +46,7 @@
 BuildRequires: zlib-devel
 BuildRequires: tetex-latex
 BuildRequires: tetex-fonts
-BuildRequires: boost-devel
+%{?_without_included_boost:BuildRequires: boost-devel}
 
 # For texhash
 Requires(post): tetex-fonts
@@ -119,8 +124,8 @@
   --enable-optimization="$RPM_OPT_FLAGS" \
   --with-aiksaurus \
   --with-aspell \
-  --without-included-boost \
-  --without-warnings --disable-debug --disable-dependency-tracking
+  --without-warnings --disable-debug --disable-dependency-tracking \
+  %{?_without_included_boost}
 
 # Intermediate cleanup
 # (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking