OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lyx?expand=0&rev=2

SuSEconfig.lyx

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# get system wide LANG setting:
-if [ -f /etc/sysconfig/lang ] ; then
-    . /etc/sysconfig/lang
-    export LANG=$RC_LANG
-fi
-
-if [ -z "$LANG" ]; then
-  export LANG="C"
-fi
-
-if test -x "/usr/share/lyx/configure"; then
-  echo "Running LyX configure script ..."
-  PWD=`pwd`
-  cd /usr/share/lyx
-  LANG=$LANG ./configure > /dev/null
-  cd $PWD
-else
-  echo "Can not execute LyX configure script!"
-fi

autogen.diff

@@ -1,20 +0,0 @@
---- autogen.sh
-+++ autogen.sh
-@@ -17,7 +17,7 @@
- }
- 
- case $automake_version in
--    *' '1.9*)
-+    *' '1.9*|*\ 1.[1-9][0-9]*|*\ [2-9]*)
- 	;;
-     *)
-     
-@@ -38,7 +38,7 @@
- }
- 	    
- case $autoversion in
--    *' '2.5[2-9])
-+    *' '2.5[2-9]|*' '2.6[0-9])
- 	EXTRA_ACINCLUDE_FILES="lyxinclude25x.m4"
- 	;;
-     *)

boost_regex.diff

@@ -1,49 +0,0 @@
---- src/frontends/controllers/biblio.C.orig	2005-03-21 14:31:22.000000000 +0000
-+++ src/frontends/controllers/biblio.C	2006-07-11 12:02:27.000000000 +0000
-@@ -376,13 +376,14 @@
- 	// Note that '[' and '\' must be escaped.
- 	// This is a limitation of boost::regex, but all other chars in BREs
- 	// are assumed literal.
--	boost::RegEx reg("[].|*?+(){}^$\\[\\\\]");
-+	boost::regex reg("[].|*?+(){}^$\\[\\\\]");
- 
- 	// $& is a perl-like expression that expands to all of the current match
- 	// The '$' must be prefixed with the escape character '\' for
- 	// boost to treat it as a literal.
- 	// Thus, to prefix a matched expression with '\', we use:
--	return reg.Merge(expr, "\\\\$&");
-+	regex_replace(expr, reg, "\\\\$&");
-+	return expr;
- }
- 
- 
-@@ -409,14 +410,14 @@
- 
- 		// Attempts to find a match for the current RE
- 		// somewhere in data.
--		return regex_.Search(data);
-+ 		return regex_search(data, regex_);
- 	}
- 
- 	bool validRE() const { return regex_.error_code() == 0; }
- 
- private:
- 	InfoMap const map_;
--	mutable boost::RegEx regex_;
-+	mutable boost::regex regex_;
- };
- 
- } // namespace anon
---- src/support/filetools.C	2006/07/11 09:33:19	1.1
-+++ src/support/filetools.C	2006/07/11 10:35:39
-@@ -610,8 +610,8 @@
- 		RTemp = "./" + path;
- 
- 	// Normalise paths like /foo//bar ==> /foo/bar
--	boost::RegEx regex("/{2,}");
--	RTemp = regex.Merge(RTemp, "/");
-+	boost::regex e("/{2,}");
-+	regex_replace(RTemp, e, "/");
- 
- 	while (!RTemp.empty()) {
- 		// Split by next /

debugstream.diff

@@ -1,11 +0,0 @@
---- src/support/debugstream.h	2006/07/11 09:02:54	1.1
-+++ src/support/debugstream.h	2006/07/11 09:03:08
-@@ -14,7 +14,7 @@
- 
- #include <iostream>
- 
--#include <boost/test/detail/nullstream.hpp>
-+#include <boost/test/utils/nullstream.hpp>
- 
- #ifdef DEBUG
- # define TEMPORARY_DEBUG_MACRO DEBUG

lyx-1.4.2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:54de255a4ef947726b6ce7067cf149804cee82fc8d27f6749cd4c927be21b782
-size 6874598

lyx-1.5.0beta2.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0a64043e994592825346db800491bccbc226e5198914a849435bff6cdcbd2c55
+size 8176131

lyx.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Apr 27 15:31:11 CEST 2007 - bg@suse.de
+
+- update to version 1.5.0beta2, notably:
+  o merge with CJK version
+  o initial unicode support
+  o qt4 frontend
+  o http://www.lyx.org/announce/1_5_0_beta2.txt
+- use included boost (which is newer than our system boost, and
+  unfortunately not compatible)
+- use TeXLive
+
 -------------------------------------------------------------------
 Sat Oct 21 14:38:18 CEST 2006 - schwab@suse.de
 

lyx.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package lyx (Version 1.4.2)
+# spec file for package lyx (Version 1.5.0beta2)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -12,19 +12,17 @@
 
 Name:           lyx
 #!BuildIgnore: lyx
-BuildRequires:  ImageMagick aspell-devel boost-devel gv ispell libdrm-devel libjpeg-devel lprng qt3-devel sgmltool te_ams te_latex te_web update-desktop-files
+BuildRequires:  ImageMagick aspell-devel boost-devel gv ispell libdrm-devel libjpeg-devel libqt4-devel lprng python sgmltool texlive-devel texlive-latex update-desktop-files
 License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL)
 Group:          Productivity/Publishing/TeX/Frontends
-Requires:       tetex te_latex ImageMagick free-ttf-fonts
+Requires:       texlive-latex ImageMagick free-ttf-fonts
 Autoreqprov:    on
-Version:        1.4.2
+Version:        1.5.0beta2
-Release:        14
+Release:        1
 Summary:        LaTeX-Based WYSIWYG Editor
 URL:            http://www.lyx.org/
 Source:         lyx-%{version}.tar.bz2
-Patch:          debugstream.diff
+Patch:          strict-aliasing-punning.diff
-Patch1:         boost_regex.diff
-Patch5:         autogen.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -43,8 +41,6 @@ Authors:
 %prep
 %setup -q -n %{name}-%{version}
 %patch
-%patch1
-%patch5
 
 %build
 %{?suse_update_config:%{suse_update_config -f config}}
@@ -56,9 +52,8 @@ export PATH=$QTDIR/bin:$PATH
 %configure \
     --with-texmf=/usr/lib/teTeX/texmf \
     --with-extra-inc=/usr/X11R6/include/X11 \
-    --without-included-boost \
     --with-aspell \
-    --with-frontend=qt \
+    --with-frontend=qt4 \
     --with-qt-dir=$QTDIR \
     --with-qt-libraries=$QTDIR/%{_lib} \
     --with-qt-includes=$QTDIR/include    
@@ -101,7 +96,16 @@ ln -s /usr/share/lyx/tex $RPM_BUILD_ROOT/usr/share/texmf/tex/latex/lyx
 %doc %{_mandir}/man1/lyxclient.1.gz
 %doc %{_mandir}/man1/tex2lyx.1.gz
 
-%changelog -n lyx
+%changelog
+* Fri Apr 27 2007 - bg@suse.de
+- update to version 1.5.0beta2, notably:
+  o merge with CJK version
+  o initial unicode support
+  o qt4 frontend
+  o http://www.lyx.org/announce/1_5_0_beta2.txt
+- use included boost (which is newer than our system boost, and
+  unfortunately not compatible)
+- use TeXLive
 * Sat Oct 21 2006 - schwab@suse.de
 - Fix bogus version check.
 * Mon Jul 17 2006 - bg@suse.de

strict-aliasing-punning.diff

@@ -0,0 +1,10 @@
+--- ./boost/libs/iostreams/src/Makefile.am	2007/04/27 11:17:24	1.1
++++ ./boost/libs/iostreams/src/Makefile.am	2007/04/27 11:18:10
+@@ -8,6 +8,7 @@
+ 
+ AM_CPPFLAGS += \
+        $(PCH_FLAGS) \
++       -fno-strict-aliasing \
+        -DBOOST_USER_CONFIG="<config.h>" \
+        $(BOOST_INCLUDES)
+