rpms/lyx/devel lyx.spec, 1.25, 1.26 lyx-1.4.0-boost.patch, 1.1, NONE lyx-1.4.0-gcc41.patch, 1.1, NONE lyx-crystal.png, 1.1, NONE

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Wed Mar 8 18:02:52 UTC 2006


Author: rdieter

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

Modified Files:
	lyx.spec 
Removed Files:
	lyx-1.4.0-boost.patch lyx-1.4.0-gcc41.patch lyx-crystal.png 
Log Message:
* Wed Mar 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-1
- 1.4.0(final)
- drop boost bits



Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- lyx.spec	3 Mar 2006 19:27:04 -0000	1.25
+++ lyx.spec	8 Mar 2006 18:02:51 -0000	1.26
@@ -1,29 +1,17 @@
 
-## avoid on fc4/gcc-4.0.2, due to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24389
-## (fixed in gcc-4.0.3)
-%if "%{?fedora}" != "4"
-#define _without_included_boost --without-included-boost
-%endif
-
-%define beta pre6
-
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.0
-Release: 0.11.%{beta}%{?dist}
+Release: 1%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
 Url: 	 http://www.lyx.org/
-Source:  ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-%{version}%{?beta}.tar.bz2
+#Source: ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-%{version}%{?beta}.tar.bz2
+Source:  ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Patch1: lyx-1.4.0-helpers.patch
-# http://bugzilla.lyx.org/show_bug.cgi?id=2297
-Patch2: lyx-1.4.0-boost.patch
-# http://bugzilla.lyx.org/show_bug.cgi?id=2278
-# http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg86593.html
-Patch3: lyx-1.4.0-gcc41.patch
 
 # app-wrapper for various frontends
 Source10: lyx.sh
@@ -48,7 +36,6 @@
 BuildRequires: zlib-devel
 BuildRequires: tetex-latex
 BuildRequires: tetex-fonts
-%{?_without_included_boost:BuildRequires: boost-devel >= 1.33}
 
 # For texhash
 Requires(post): tetex-fonts
@@ -102,11 +89,6 @@
 %setup -q -n %{name}-%{version}%{?beta}
 
 %patch1 -p1 -b .helpers
-%patch2 -p1 -b .boost
-# possibly questionable patch, leave out for now -- Rex 
-#patch3 -p0 -b .gcc41
-
-# ./autogen.sh
 
 
 %build
@@ -178,12 +160,12 @@
 # Catch installed/uninstalled helpers
 %triggerin -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv
 if [ $2 -gt 1 ]; then
-cd %{_datadir}/lyx && ./configure > /dev/null 2>&1 ||: 
+cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: 
 fi
 
 %triggerun -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv
 if [ $2 -eq 0 ]; then
-cd %{_datadir}/lyx && ./configure > /dev/null 2>&1 ||:
+cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||:
 fi
 
 
@@ -216,6 +198,14 @@
 
 
 %changelog
+* Wed Mar 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-1
+- 1.4.0(final)
+- drop boost bits
+
+* Tue Mar 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.12.rc
+- 1.4.0rc
+- drop boost patch (for now)
+
 * Fri Mar 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.11.pre6
 - 1.4.0pre6
 - --disable-stdlib-debug --disable-assertions --disable-concept-checks


--- lyx-1.4.0-boost.patch DELETED ---


--- lyx-1.4.0-gcc41.patch DELETED ---




More information about the fedora-extras-commits mailing list