From 5cd0e62468bbcfc6bb44326436d4b6adf075408d41ee8e05a309ccd6d73b26d3 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 24 Sep 2008 15:11:38 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lyx?expand=0&rev=11 --- lyx-1.5.3.diff | 10 -------- lyx-1.5.5.tar.bz2 | 3 --- lyx-1.6.0rc2.tar.bz2 | 3 +++ lyx.changes | 18 +++++++++++++ lyx.spec | 49 +++++++++++++++++++++++++----------- strict-aliasing-punning.diff | 10 -------- 6 files changed, 55 insertions(+), 38 deletions(-) delete mode 100644 lyx-1.5.3.diff delete mode 100644 lyx-1.5.5.tar.bz2 create mode 100644 lyx-1.6.0rc2.tar.bz2 delete mode 100644 strict-aliasing-punning.diff diff --git a/lyx-1.5.3.diff b/lyx-1.5.3.diff deleted file mode 100644 index 52a4542..0000000 --- a/lyx-1.5.3.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- src/support/lyxsum.cpp.orig 2008-01-12 18:10:41.000000000 +0100 -+++ src/support/lyxsum.cpp 2008-01-12 18:11:17.000000000 +0100 -@@ -41,6 +41,7 @@ template struct boost::detail::crc_table - - // Make sure we get modern version of mmap and friends with void*, - // not `compatibility' version with caddr_t. -+#undef _POSIX_C_SOURCE - #define _POSIX_C_SOURCE 199506L - - #ifdef HAVE_SYS_TYPES_H diff --git a/lyx-1.5.5.tar.bz2 b/lyx-1.5.5.tar.bz2 deleted file mode 100644 index 13e586d..0000000 --- a/lyx-1.5.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:051e952d206a9b0ca7a4584821ecaa88b6ed5f88a241767d97370932258c7539 -size 9082787 diff --git a/lyx-1.6.0rc2.tar.bz2 b/lyx-1.6.0rc2.tar.bz2 new file mode 100644 index 0000000..1142dcc --- /dev/null +++ b/lyx-1.6.0rc2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd0964687862988dca7610d81786991a0fb05ff1a49af27f4a4e6798aa492f9e +size 9895834 diff --git a/lyx.changes b/lyx.changes index 5f75dd7..067dfcc 100644 --- a/lyx.changes +++ b/lyx.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri Sep 19 10:22:48 CEST 2008 - stbinner@suse.de + +- update to 1.6 release candidate 2 (bnc#427534) + * multiple work areas as tab items + * split views + * user-formattable collapsable insets + * layout modules + * citation dialog + * support for the LaTeX package hyperref + * dialog for insertion of hyperlinks and URLs + * revised support for wrapped floats + * new implementation of math macros + * TAB completion in the math editor and in text mode + * framework for tooltip showing in the document work area + * new symbols dialog + * and much more: http://wiki.lyx.org/LyX/NewInLyX16 + ------------------------------------------------------------------- Tue Jul 22 17:15:46 CEST 2008 - coolo@suse.de diff --git a/lyx.spec b/lyx.spec index 147e74a..319fa8b 100644 --- a/lyx.spec +++ b/lyx.spec @@ -1,10 +1,17 @@ # -# spec file for package lyx (Version 1.5.5) +# spec file for package lyx (Version 1.6rc2) # # Copyright (c) 2008 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. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -13,7 +20,7 @@ Name: lyx #!BuildIgnore: lyx -BuildRequires: ImageMagick aspell-devel boost-devel gv ispell libdrm-devel libjpeg-devel libqt4-devel lprng python sgmltool update-desktop-files +BuildRequires: ImageMagick aspell-devel boost-devel fdupes gv ispell libdrm-devel libjpeg-devel libqt4-devel lprng python sgmltool update-desktop-files %if %suse_version > 1020 BuildRequires: texlive-devel texlive-latex %else @@ -23,15 +30,14 @@ License: LGPL v2.1 or later Group: Productivity/Publishing/TeX/Frontends Requires: texlive-latex ImageMagick free-ttf-fonts AutoReqProv: on -Version: 1.5.5 -Release: 2 +Version: 1.6rc2 +Release: 1 +%define rversion 1.6.0rc2 Summary: LaTeX-Based WYSIWYG Editor Url: http://www.lyx.org/ -Source: lyx-%{version}.tar.bz2 +Source: lyx-%{rversion}.tar.bz2 Source1: lyx.desktop Source2: lyx.png -Patch: strict-aliasing-punning.diff -Patch1: lyx-1.5.3.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -48,9 +54,7 @@ Authors: Matthias Ettrich %prep -%setup -q -n %{name}-%{version} -%patch -%patch1 +%setup -q -n %{name}-%{rversion} %build #%{?suse_update_config:%{suse_update_config -f config}} @@ -70,7 +74,6 @@ export PATH=$QTDIR/bin:$PATH make %{?jobs:-j%jobs} %install -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; make install DESTDIR=$RPM_BUILD_ROOT TEXMF=/usr/lib/teTeX/texmf mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} pushd $RPM_BUILD_ROOT/usr/share/lyx/doc/ @@ -80,12 +83,13 @@ pushd $RPM_BUILD_ROOT/usr/share/lyx/doc/ $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ done popd -cp ABOUT-NLS ANNOUNCE COPYING ChangeLog INSTALL* NEWS \ - README* UPGRADING \ +cp ABOUT-NLS ANNOUNCE COPYING INSTALL* NEWS \ + README README.localization RELEASE-NOTES UPGRADING \ $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 %suse_update_desktop_file -i lyx Office WordProcessor +%fdupes -s $RPM_BUILD_ROOT %find_lang %name %clean @@ -107,6 +111,21 @@ rm -rf $RPM_BUILD_ROOT %doc %{_mandir}/man1/tex2lyx.1.gz %changelog +* Fri Sep 19 2008 stbinner@suse.de +- update to 1.6 release candidate 2 (bnc#427534) + * multiple work areas as tab items + * split views + * user-formattable collapsable insets + * layout modules + * citation dialog + * support for the LaTeX package hyperref + * dialog for insertion of hyperlinks and URLs + * revised support for wrapped floats + * new implementation of math macros + * TAB completion in the math editor and in text mode + * framework for tooltip showing in the document work area + * new symbols dialog + * and much more: http://wiki.lyx.org/LyX/NewInLyX16 * Tue Jul 22 2008 coolo@suse.de - update to 1.5.5: * for changelog, see http://www.lyx.org/announce/1_5_5.txt diff --git a/strict-aliasing-punning.diff b/strict-aliasing-punning.diff deleted file mode 100644 index a6c16d8..0000000 --- a/strict-aliasing-punning.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- ./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="" \ - $(BOOST_INCLUDES) -