Accepting request 69726 from home:cornelisbb:branches:Publishing

update to 2.0.0 and used url as source and gz no longer recompressed to bz2

OBS-URL: https://build.opensuse.org/request/show/69726
OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=20

gcc46.patch

@@ -1,77 +0,0 @@
-Index: src/support/unicode.h
-===================================================================
---- src/support/unicode.h.orig	2009-05-19 17:28:27.000000000 +0200
-+++ src/support/unicode.h	2011-04-22 09:17:28.163344641 +0200
-@@ -15,6 +15,7 @@
- 
- #include "support/strfwd.h"
- 
-+#include <cstddef>
- #include <vector>
- 
- 
-Index: src/frontends/qt4/GuiIdListModel.cpp
-===================================================================
---- src/frontends/qt4/GuiIdListModel.cpp.orig	2008-04-30 10:26:40.000000000 +0200
-+++ src/frontends/qt4/GuiIdListModel.cpp	2011-04-22 09:17:28.169344377 +0200
-@@ -76,9 +76,8 @@ bool GuiIdListModel::insertRows(int row,
- 	if (!rowIsValid(row))
- 		return false;
- 	vector<OurData>::iterator it = userData_.begin() + row;
--	OurData const v;
- 	beginInsertRows(QModelIndex(), row, row + count - 1);
--	userData_.insert(it, count, v);
-+	userData_.insert(it, count, OurData());
- 	endInsertRows();
- 	return true;
- }
-Index: src/support/weighted_btree.h
-===================================================================
---- src/support/weighted_btree.h.orig	2008-02-28 18:52:15.000000000 +0100
-+++ src/support/weighted_btree.h	2011-04-22 09:17:59.369974111 +0200
-@@ -33,6 +33,7 @@
- #include <istream>
- #include <ostream>
- #include <assert.h>
-+#include <cstddef>
- 
- // *** Debugging Macros
- 
-Index: src/mathed/MathData.h
-===================================================================
---- src/mathed/MathData.h.orig	2010-01-20 03:10:29.000000000 +0100
-+++ src/mathed/MathData.h	2011-04-22 09:35:57.325632825 +0200
-@@ -21,6 +21,7 @@
- #include "support/strfwd.h"
- 
- #include <vector>
-+#include <cstddef>
- 
- 
- namespace lyx {
-Index: src/insets/InsetCommandParams.cpp
-===================================================================
---- src/insets/InsetCommandParams.cpp.orig	2010-03-02 16:19:12.000000000 +0100
-+++ src/insets/InsetCommandParams.cpp	2011-04-22 09:49:24.304168428 +0200
-@@ -77,7 +77,7 @@ static ParamInfo const & findInfo(InsetC
- 	default:
- 		LASSERT(false, /**/);
- 	}
--	static const ParamInfo pi;
-+	static ParamInfo pi;
- 	return pi; // to silence the warning
- }
- 
-Index: src/insets/InsetInclude.cpp
-===================================================================
---- src/insets/InsetInclude.cpp.orig	2010-12-21 18:28:07.000000000 +0100
-+++ src/insets/InsetInclude.cpp	2011-04-22 10:03:53.606962805 +0200
-@@ -790,7 +790,7 @@ support::FileNameList const &
- 		tmp->setParent(&buffer);
- 		return cache;
- 	}
--	static support::FileNameList const empty;
-+	static support::FileNameList empty;
- 	return empty;
- }
- 

lyx-1.6.9.tar.bz2

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

lyx-2.0.0.tar.gz

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

lyx.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Thu May  5 19:12:11 UTC 2011 - cornelis@solcon.nl
+
+- Name URL as source and do not recompress to bz2
+
+-------------------------------------------------------------------
+Tue May  3 11:07:08 UTC 2011 - cornelis@solcon.nl
+
+- Update to 2.0.0:
+  * Advanced Search Facility
+  * Spell-checking on the Fly
+  * Compare Documents Feature
+  * XHTML Output
+  * Multilingual Thesaurus
+  * XeTeX Backend
+  * Multiple Indices Support
+  * Progress View and Debugging Pane
+  * Enhanced Instant Preview
+  * Forward Search for DVI/PDF Files
+  * Enhanced Version Control Features
+  * for detauls see http://wiki.lyx.org/LyX/NewInLyX20
+- Removed ispell-devel from BuildRequires: no longer supported
+- Added hunspell-devel
+- Added texlive-xetex als Recommends since it is now supported by LyX
+- Added lyx.dist with distro defaults to get hunspell, thesaurus and lyxpipe working out of the box
+
 -------------------------------------------------------------------
 Fri Apr 22 08:25:39 UTC 2011 - coolo@opensuse.org
 

lyx.spec

@@ -20,29 +20,22 @@
 
 Name:           lyx
 #!BuildIgnore: lyx
-BuildRequires:  ImageMagick aspell-devel boost-devel fdupes gv ispell libdrm-devel libjpeg-devel libqt4-devel python sgmltool update-desktop-files
+BuildRequires:  ImageMagick aspell-devel boost-devel fdupes gv hunspell-devel libdrm-devel libjpeg-devel libqt4-devel python sgmltool texlive-devel texlive-latex update-desktop-files
-%if %suse_version > 1020
-BuildRequires:  texlive-devel texlive-latex
-%else
-BuildRequires:  te_latex tetex
-%endif
 License:        LGPLv2.1+
 Group:          Productivity/Publishing/TeX/Frontends
 Requires:       texlive-latex ImageMagick
 AutoReqProv:    on
-Version:        1.6.9
+Version:        2.0.0
-Release:        6
+Release:        3
-%define rversion 1.6.9
 Summary:        LaTeX-Based WYSIWYG Editor
 Url:            http://www.lyx.org/
-Source:         lyx-%{rversion}.tar.bz2
+Source:         ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/lyx-2.0.0.tar.gz
 Source1:        lyx.desktop
 Source2:        lyx.png
-# PATCH-FIX-UPSTREAM gcc46.patch -- Add missing include to fix compilation with gcc 4.6
+Source3:        lyxrc.dist
-Patch:          gcc46.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
-Recommends:     xindy
+Recommends:     texlive-xetex xindy
 
 %description
 LyX is a front-end for LaTeX under X11. It combines the comfortable use
@@ -52,8 +45,7 @@ level attributes ("large italic") but high level layouts (styles) for
 each paragraph. Of course, low level formatting is still possible.
 
 %prep
-%setup -q -n %{name}-%{rversion}
+%setup -q -n %{name}-%{version}
-%patch
 
 %build
 #%{?suse_update_config:%{suse_update_config -f config}}
@@ -73,7 +65,7 @@ TEXMF=$(kpsexpand '$TEXMFDIST')
 %if %suse_version < 1020
     --with-extra-inc=/usr/X11R6/include/X11 \
 %endif
-    --with-aspell \
+    --with-aspell --with-hunspell \
     --with-frontend=qt4 
 make %{?jobs:-j%jobs}
 
@@ -86,6 +78,10 @@ TEXMF=$(kpsexpand '$TEXMFDIST')
 %endif
 %endif
 make install DESTDIR=$RPM_BUILD_ROOT TEXMF=$TEXMF
+
+# some defaults
+install -p -m644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/lyx/lyxrc.dist
+
 mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
 pushd $RPM_BUILD_ROOT%{_datadir}/lyx/doc/
     for i in *

lyxrc.dist

@@ -0,0 +1,26 @@
+### This file is part of
+### ========================================================
+###          LyX, The Document Processor
+###
+###          Copyright 1995 Matthias Ettrich
+###          Copyright 1995-2011 The LyX Team.
+###
+### ========================================================
+
+# The file lyxrc.dist gives initial global options for all LyX users.
+# Almost all settings here can be overridden through the preferences in LyX.
+
+# Some default settings for things stuff that otherwise would not work out of the box
+
+#
+# MISC SECTION ######################################
+#
+
+\serverpipe "~/.lyx/lyxpipe"
+
+#
+# FILE SECTION ######################################
+#
+
+\thesaurusdir_path "/usr/share/mythes"
+\hunspelldir_path "/usr/share/myspell"