rpms/lyx/devel .cvsignore, 1.7, 1.8 lyx.spec, 1.24, 1.25 sources, 1.8, 1.9

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Fri Mar 3 19:27:04 UTC 2006


Author: rdieter

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

Modified Files:
	.cvsignore lyx.spec sources 
Log Message:
* 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
- don't use --without-included-boost (for now)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	13 Feb 2006 16:15:28 -0000	1.7
+++ .cvsignore	3 Mar 2006 19:27:04 -0000	1.8
@@ -1 +1 @@
-lyx-1.4.0pre5.tar.bz2
+lyx-1.4.0pre6.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- lyx.spec	20 Feb 2006 13:25:20 -0000	1.24
+++ lyx.spec	3 Mar 2006 19:27:04 -0000	1.25
@@ -2,15 +2,15 @@
 ## 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
+#define _without_included_boost --without-included-boost
 %endif
 
-%define beta pre5
+%define beta pre6
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.0
-Release: 0.10.%{beta}%{?dist}
+Release: 0.11.%{beta}%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -103,10 +103,8 @@
 
 %patch1 -p1 -b .helpers
 %patch2 -p1 -b .boost
-# possibly questionable patch, leave it for gcc-4.1 platform(s) only
-%if "%{?fedora}" > "4"
-%patch3 -p0 -b .gcc41
-%endif
+# possibly questionable patch, leave out for now -- Rex 
+#patch3 -p0 -b .gcc41
 
 # ./autogen.sh
 
@@ -115,7 +113,7 @@
 
 # QT
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include
+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||' )"
@@ -130,7 +128,8 @@
   --enable-optimization="$RPM_OPT_FLAGS" \
   --with-aiksaurus \
   --with-aspell \
-  --without-warnings --disable-debug --disable-dependency-tracking \
+  --without-warnings --disable-dependency-tracking \
+  --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks \
   %{?_without_included_boost}
 
 # Intermediate cleanup
@@ -170,21 +169,21 @@
 %post
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
 texhash > /dev/null 2>&1 ||:
-cd %{_datadir}/lyx && ./configure 
+cd %{_datadir}/lyx && ./configure  > /dev/null 2>&1 ||:
 
 %postun
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
-texhash >& /dev/null ||:
+texhash > /dev/null 2>&1 ||:
 
 # Catch installed/uninstalled helpers
 %triggerin -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv
 if [ $2 -gt 1 ]; then
-cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null
+cd %{_datadir}/lyx && ./configure > /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 --srcdir >& /dev/null
+cd %{_datadir}/lyx && ./configure > /dev/null 2>&1 ||:
 fi
 
 
@@ -217,6 +216,11 @@
 
 
 %changelog
+* 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
+- don't use --without-included-boost (for now)
+
 * Mon Feb 20 2006 Rex Dieter <rexdieter[AT]usres.sf.net> 1.4.0-0.10.pre5
 - gcc41 patch
 - document boost/gcc41 patches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	13 Feb 2006 16:15:28 -0000	1.8
+++ sources	3 Mar 2006 19:27:04 -0000	1.9
@@ -1 +1 @@
-dd137748afafc7e79cd76056882d5f05  lyx-1.4.0pre5.tar.bz2
+bcc2e2b301a4e30e9bf7556afccae060  lyx-1.4.0pre6.tar.bz2




More information about the fedora-extras-commits mailing list