Hello community,
here is the log from the commit of package lyx
checked in at Mon Jul 17 18:05:22 CEST 2006.
--------
--- lyx/lyx.changes 2006-07-11 09:32:50.000000000 +0200
+++ lyx/lyx.changes 2006-07-17 16:19:35.000000000 +0200
@@ -1,0 +2,18 @@
+Mon Jul 17 10:22:11 CEST 2006 - bg@suse.de
+
+- specfile cleanups and fixes for 1.4.2
+- moved lyx binaries to /usr/bin to be in the same prefix as the
+ shared files.
+
+-------------------------------------------------------------------
+Thu Jul 13 14:20:45 CEST 2006 - bg@suse.de
+
+- update to version 1.4.2
+ o many bugfixes
+ o improved import filter for TeX files
+ o several new features like wordcount, branches and changetracking
+ for documents
+ o the configuration now searches for many more helper utilities
+- use system boost libraries instead of included boost
+
+-------------------------------------------------------------------
Old:
----
compile.diff
lyx-1.3.6.tar.bz2
lyx-boost_compiler_version.diff
lyx-codecleanup.diff
lyx-configure.diff
no-nb.diff
New:
----
boost_regex.diff
debugstream.diff
lyx-1.4.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lyx.spec ++++++
--- /var/tmp/diff_new_pack.UvPVxT/_old 2006-07-17 18:04:22.000000000 +0200
+++ /var/tmp/diff_new_pack.UvPVxT/_new 2006-07-17 18:04:22.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package lyx (Version 1.3.6)
+# spec file for package lyx (Version 1.4.2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,22 +12,18 @@
Name: lyx
#!BuildIgnore: lyx
-BuildRequires: ImageMagick 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 lprng qt3-devel sgmltool te_ams te_latex te_web update-desktop-files
License: LGPL
Group: Productivity/Publishing/TeX/Frontends
Requires: tetex te_latex ImageMagick free-ttf-fonts
Autoreqprov: on
-Version: 1.3.6
-Release: 20
+Version: 1.4.2
+Release: 2
Summary: LaTeX-Based WYSIWYG Editor
URL: http://www.lyx.org/
Source: lyx-%{version}.tar.bz2
-Source1: SuSEconfig.lyx
-Patch: no-nb.diff
-Patch1: lyx-configure.diff
-Patch2: compile.diff
-Patch3: lyx-boost_compiler_version.diff
-Patch4: lyx-codecleanup.diff
+Patch: debugstream.diff
+Patch1: boost_regex.diff
Patch5: autogen.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -48,29 +44,20 @@
%setup -q -n %{name}-%{version}
%patch
%patch1
-%patch2
-%patch3
-%patch4
%patch5
-mv po/no.po po/nb.po
-mv po/no.gmo po/nb.gmo
%build
%{?suse_update_config:%{suse_update_config -f config}}
-#aclocal
-#automake --gnu --include-deps Makefile
-#autoconf
./autogen.sh
export CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRERROR -fno-inline"
export CXXFLAGS="$RPM_OPT_FLAGS -DHAVE_STRERROR -fno-inline"
export QTDIR=/usr/lib/qt3/
export PATH=$QTDIR/bin:$PATH
-./configure \
- --prefix=/usr \
+%configure \
--with-texmf=/usr/lib/teTeX/texmf \
--with-extra-inc=/usr/X11R6/include/X11 \
- --bindir=/usr/X11R6/bin \
- --mandir=%{_mandir} \
+ --without-included-boost \
+ --with-aspell \
--with-frontend=qt \
--with-qt-dir=$QTDIR \
--with-qt-libraries=$QTDIR/%{_lib} \
@@ -93,9 +80,6 @@
$RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/
mkdir -p $RPM_BUILD_ROOT/usr/share/texmf/tex/latex
ln -s /usr/share/lyx/tex $RPM_BUILD_ROOT/usr/share/texmf/tex/latex/lyx
-mkdir -p $RPM_BUILD_ROOT/sbin/conf.d/
-install -m 755 $RPM_SOURCE_DIR/SuSEconfig.lyx $RPM_BUILD_ROOT/sbin/conf.d/
-chmod 755 $RPM_BUILD_ROOT/usr/share/lyx/configure
%suse_update_desktop_file -i lyx Office WordProcessor
%clean
@@ -104,20 +88,32 @@
%files
%defattr(-,root,root)
%docdir /usr/share/lyx/doc
-/sbin/conf.d/SuSEconfig.lyx
%doc %{_defaultdocdir}/lyx
/usr/share/locale/*/LC_MESSAGES/lyx.mo
-/usr/X11R6/bin/lyx
-/usr/X11R6/bin/reLyX
-/usr/X11R6/bin/noweb2lyx
+/usr/bin/lyx
+/usr/bin/lyxclient
+/usr/bin/tex2lyx
/usr/share/applications/lyx.desktop
/usr/share/pixmaps/lyx.png
/usr/share/texmf/tex/latex/lyx
/usr/share/lyx
%doc %{_mandir}/man1/lyx.1.gz
-%doc %{_mandir}/man1/reLyX.1.gz
+%doc %{_mandir}/man1/lyxclient.1.gz
+%doc %{_mandir}/man1/tex2lyx.1.gz
%changelog -n lyx
+* Mon Jul 17 2006 - bg@suse.de
+- specfile cleanups and fixes for 1.4.2
+- moved lyx binaries to /usr/bin to be in the same prefix as the
+ shared files.
+* Thu Jul 13 2006 - bg@suse.de
+- update to version 1.4.2
+ o many bugfixes
+ o improved import filter for TeX files
+ o several new features like wordcount, branches and changetracking
+ for documents
+ o the configuration now searches for many more helper utilities
+- use system boost libraries instead of included boost
* Tue Jul 11 2006 - bg@suse.de
- make autogen.sh work with newer versions of autoconf
* Fri Jan 27 2006 - mls@suse.de
++++++ autogen.diff ++++++
--- /var/tmp/diff_new_pack.UvPVxT/_old 2006-07-17 18:04:22.000000000 +0200
+++ /var/tmp/diff_new_pack.UvPVxT/_new 2006-07-17 18:04:22.000000000 +0200
@@ -1,11 +1,11 @@
---- autogen.sh 2006/07/11 07:13:28 1.1
-+++ autogen.sh 2006/07/11 07:14:04
-@@ -19,7 +19,7 @@
- rm -f lib/reLyX/configure.ac
- EXTRA_ACINCLUDE_FILES="lyxinclude213.m4"
+--- autogen.sh 2006/07/11 07:45:11 1.1
++++ autogen.sh 2006/07/11 07:46:10
+@@ -38,7 +38,7 @@
+ }
+
+ case $autoversion in
+- *' '2.5[2-9])
++ *' '2.5[2-9]|*' '2.6[0-9])
+ EXTRA_ACINCLUDE_FILES="lyxinclude25x.m4"
;;
-- *2.5[2-9])
-+ *2.5[2-9]|*2.6[0-9])
- rm -f acconfig.h
- rm -f configure.in
- cp config/configure.ac .
+ *)
++++++ boost_regex.diff ++++++
--- 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 ++++++
--- 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