From 5b51927dda7d9237f2b65323814e541b416e81c72b073c950218e18a7ccfc71c Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Wed, 17 Sep 2014 11:39:08 +0000 Subject: [PATCH 1/4] update to 2.1.2 OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=90 --- lyx-2.1.1.tar.xz | 3 - ...xdg_open.patch => lyx-2.1.2-xdg_open.patch | 16 ++-- lyx-2.1.2.tar.xz | 3 + lyx.changes | 10 +++ lyx.spec | 79 ++++++++++--------- 5 files changed, 62 insertions(+), 49 deletions(-) delete mode 100644 lyx-2.1.1.tar.xz rename lyx-2.1.0-xdg_open.patch => lyx-2.1.2-xdg_open.patch (85%) create mode 100644 lyx-2.1.2.tar.xz diff --git a/lyx-2.1.1.tar.xz b/lyx-2.1.1.tar.xz deleted file mode 100644 index 7261453..0000000 --- a/lyx-2.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca5bf218bc86deadc9eca22030a96e911b0642b3fa0e359c14891dff7f0b39ba -size 10638872 diff --git a/lyx-2.1.0-xdg_open.patch b/lyx-2.1.2-xdg_open.patch similarity index 85% rename from lyx-2.1.0-xdg_open.patch rename to lyx-2.1.2-xdg_open.patch index 787f8dd..0109a00 100644 --- a/lyx-2.1.0-xdg_open.patch +++ b/lyx-2.1.2-xdg_open.patch @@ -1,6 +1,6 @@ -diff -ur lyx-2.1.0.orig/lib/configure.py lyx-2.1.0/lib/configure.py ---- lyx-2.1.0.orig/lib/configure.py 2014-04-13 19:23:17.000000000 +0200 -+++ lyx-2.1.0/lib/configure.py 2014-04-14 22:48:03.871041731 +0200 +diff -ur lyx-2.1.2.orig/lib/configure.py lyx-2.1.2/lib/configure.py +--- lyx-2.1.2.orig/lib/configure.py 2014-09-16 18:31:40.000000000 +0200 ++++ lyx-2.1.2/lib/configure.py 2014-09-17 13:01:46.266158060 +0200 @@ -594,7 +594,7 @@ \Format tiff tif TIFF "" "%s" "%s" "" "image/tiff" \Format xbm xbm XBM "" "%s" "%s" "" "image/x-xbitmap" @@ -23,17 +23,17 @@ diff -ur lyx-2.1.0.orig/lib/configure.py lyx-2.1.0/lib/configure.py # #checkProg('a Postscript interpreter', ['gs'], # rc_entry = [ r'\ps_command "%%"' ]) -- checkViewer('a Postscript previewer', ['kghostview', 'okular', 'evince', 'gv', 'ghostview -swap'], -+ checkViewer('a Postscript previewer', ['xdg-open', 'kghostview', 'okular', 'evince', 'gv', 'ghostview -swap'], +- checkViewer('a Postscript previewer', ['kghostview', 'okular', 'qpdfview --unique', 'evince', 'gv', 'ghostview -swap', 'gsview64', 'gsview32'], ++ checkViewer('a Postscript previewer', ['xdg-open', 'kghostview', 'okular', 'qpdfview --unique', 'evince', 'gv', 'ghostview -swap', 'gsview64', 'gsview32'], rc_entry = [r'''\Format eps eps EPS "" "%%" "" "vector" "image/x-eps" \Format eps2 eps "EPS (uncropped)" "" "%%" "" "vector" "" \Format eps3 eps "EPS (cropped)" "" "%%" "" "document,menu=export" "" \Format ps ps Postscript t "%%" "" "document,vector,menu=export" "application/postscript"''']) # for xdg-open issues look here: http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg151818.html # the MIME type is set for pdf6, because that one needs to be autodetectable by libmime -- checkViewer('a PDF previewer', ['pdfview', 'kpdf', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', 'mupdf', \ -+ checkViewer('a PDF previewer', ['xdg-open', 'pdfview', 'kpdf', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', 'mupdf', \ - 'gv', 'ghostview'], +- checkViewer('a PDF previewer', ['pdfview', 'kpdf', 'okular', 'qpdfview --unique', 'evince', 'kghostview', 'xpdf', 'SumatraPDF', 'acrobat', 'acroread', 'mupdf', \ ++ checkViewer('a PDF previewer', ['xdg-open', 'pdfview', 'kpdf', 'okular', 'qpdfview --unique', 'evince', 'kghostview', 'xpdf', 'SumatraPDF', 'acrobat', 'acroread', 'mupdf', \ + 'gv', 'ghostview', 'AcroRd32', 'gsview64', 'gsview32'], rc_entry = [r'''\Format pdf pdf "PDF (ps2pdf)" P "%%" "" "document,vector,menu=export" "" \Format pdf2 pdf "PDF (pdflatex)" F "%%" "" "document,vector,menu=export" "" @@ -663,14 +663,14 @@ diff --git a/lyx-2.1.2.tar.xz b/lyx-2.1.2.tar.xz new file mode 100644 index 0000000..38a1b7b --- /dev/null +++ b/lyx-2.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54c7f7843eac4642a7b682bb3195fe48e078d2db893ee1afdf5699fd7542cccf +size 10660916 diff --git a/lyx.changes b/lyx.changes index b1ccd76..035bf6b 100644 --- a/lyx.changes +++ b/lyx.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Sep 17 11:19:25 UTC 2014 - cornelis@solcon.nl + +- Update to version 2.1.2: + * Bugfix release (for details see http://www.lyx.org/announce/2_1_2.txt or included ANNOUNCE file)) +- Added file-devel to BuildRequires to provide magic.h +- Changed most Requires to Recommends to give expert users more control, but still have them installed when default settings are used. +- Updated xdg-open patch +- Removed deprecated --with-frontend=qt4 configure option. + ------------------------------------------------------------------- Tue Jul 15 19:46:42 UTC 2014 - cornelis@solcon.nl diff --git a/lyx.spec b/lyx.spec index 0cbd061..94f6cfc 100644 --- a/lyx.spec +++ b/lyx.spec @@ -22,12 +22,13 @@ BuildRequires: bc BuildRequires: boost-devel BuildRequires: enchant-devel BuildRequires: fdupes +BuildRequires: file-devel BuildRequires: hunspell-devel BuildRequires: libqt4-devel BuildRequires: python BuildRequires: update-desktop-files BuildRequires: xz -Version: 2.1.1 +Version: 2.1.2 Release: 0 Summary: WYSIWYM (What You See Is What You Mean) document processor License: GPL-2.0+ @@ -37,7 +38,7 @@ Source: ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/lyx-%{version}.tar.xz Source1: lyxrc.dist # xdg patch # This was rejected by upstream (http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg133878.html) -Patch0: lyx-2.1.0-xdg_open.patch +Patch0: lyx-2.1.2-xdg_open.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: ImageMagick %if 0%{?suse_version} < 1230 @@ -45,43 +46,46 @@ Requires: texlive-latex Recommends: texlive-xetex Recommends: xindy %else -# Goal is to require (roughly) everything that is supported in the GUI of LyX +# Goal is to require/recommends (roughly) everything that is supported in the GUI of LyX # LyX can supoort everything of LaTeX in the preamble, but not everything is supported in the GUI # I have ingored extra fonts and document classes -Requires: texlive-algorithms -Requires: texlive-arabi -Requires: texlive-bezos -Requires: texlive-bibtopic -Requires: texlive-braille -Requires: texlive-collection-fontsrecommended -Requires: texlive-collection-htmlxml -Requires: texlive-collection-latexrecommended -Requires: texlive-collection-luatex -Requires: texlive-collection-xetex -Requires: texlive-covington -Requires: texlive-endnotes -Requires: texlive-esint -Requires: texlive-fragments -Requires: texlive-ifsym -Requires: texlive-mathdots -Requires: texlive-mhchem -Requires: texlive-multirow -Requires: texlive-nomencl -Requires: texlive-pdfsync -Requires: texlive-prettyref -Requires: texlive-refstyle -Requires: texlive-rotfloat -Requires: texlive-splitindex -Requires: texlive-textgreek -Requires: texlive-units -Requires: texlive-wrapfig -Requires: texlive-zhmetrics -Requires: xindy +# Thuis is a minimal requirement +Requires: texlive-collection-latex +# The rest is recommended, so that expert users can have some control +Recommends: texlive-algorithms +Recommends: texlive-arabi +Recommends: texlive-bezos +Recommends: texlive-bibtopic +Recommends: texlive-braille +Recommends: texlive-collection-fontsrecommended +Recommends: texlive-collection-htmlxml +Recommends: texlive-collection-latexrecommended +Recommends: texlive-collection-luatex +Recommends: texlive-collection-xetex +Recommends: texlive-covington +Recommends: texlive-endnotes +Recommends: texlive-esint +Recommends: texlive-fragments +Recommends: texlive-ifsym +Recommends: texlive-mathdots +Recommends: texlive-mhchem +Recommends: texlive-multirow +Recommends: texlive-nomencl +Recommends: texlive-pdfsync +Recommends: texlive-prettyref +Recommends: texlive-refstyle +Recommends: texlive-rotfloat +Recommends: texlive-splitindex +Recommends: texlive-textgreek +Recommends: texlive-units +Recommends: texlive-wrapfig +Recommends: texlive-zhmetrics +Recommends: xindy # Some stuff needed for LyX's documentation: -Requires: texlive-braket -Requires: texlive-diagbox -Requires: texlive-picinpar -Requires: texlive-sidecap +Recommends: texlive-braket +Recommends: texlive-diagbox +Recommends: texlive-picinpar +Recommends: texlive-sidecap # Only suggest biblatex/biber, because only the engine (biber) is supported in the GUI, # not biblatex itself (the only one that can use biber) Suggests: texlive-biber @@ -117,8 +121,7 @@ TEXMF=%{_datadir}/texmf --without-included-boost \ --without-aspell \ --with-hunspell \ - --with-enchant \ - --with-frontend=qt4 + --with-enchant make %{?_smp_mflags} %install From 12e190266116a3a59258dc4fc1ce7bfa4ce4ad34a63d70eee46b926847b67359 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Tue, 23 Sep 2014 17:03:26 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=91 --- lyx-2.1.2.tar.xz | 4 ++-- lyx.changes | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lyx-2.1.2.tar.xz b/lyx-2.1.2.tar.xz index 38a1b7b..41de64d 100644 --- a/lyx-2.1.2.tar.xz +++ b/lyx-2.1.2.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54c7f7843eac4642a7b682bb3195fe48e078d2db893ee1afdf5699fd7542cccf -size 10660916 +oid sha256:c8783822341e95cc2a6b5da1b0e838542fd875017d8775f237b17c1790b1bba5 +size 10669264 diff --git a/lyx.changes b/lyx.changes index 035bf6b..2e42d3c 100644 --- a/lyx.changes +++ b/lyx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 23 17:01:46 UTC 2014 - cornelis@solcon.nl + +- Updated tarball (a couple of new French beamer examples were not included) + ------------------------------------------------------------------- Wed Sep 17 11:19:25 UTC 2014 - cornelis@solcon.nl From 059f8477ac58f0b884f214c81ce17391f7f52a971be588fdc835d92fe2807cb8 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Thu, 25 Sep 2014 13:08:20 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=92 --- lyx.changes | 5 +++++ lyx.spec | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lyx.changes b/lyx.changes index 2e42d3c..a4cc71c 100644 --- a/lyx.changes +++ b/lyx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 25 13:06:42 UTC 2014 - cornelis@solcon.nl + +- Remove the minimal hard texlive requirement. + ------------------------------------------------------------------- Tue Sep 23 17:01:46 UTC 2014 - cornelis@solcon.nl diff --git a/lyx.spec b/lyx.spec index 94f6cfc..3afae6a 100644 --- a/lyx.spec +++ b/lyx.spec @@ -49,9 +49,7 @@ Recommends: xindy # Goal is to require/recommends (roughly) everything that is supported in the GUI of LyX # LyX can supoort everything of LaTeX in the preamble, but not everything is supported in the GUI # I have ingored extra fonts and document classes -# Thuis is a minimal requirement -Requires: texlive-collection-latex -# The rest is recommended, so that expert users can have some control +# Use "Recommends" so that expert users can have some control Recommends: texlive-algorithms Recommends: texlive-arabi Recommends: texlive-bezos From 7311da39e773e2b93d51a1f70ef40cc3a9d22ef531c0aed869abd85b1b257194 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Sat, 27 Sep 2014 12:22:51 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=93 --- lyx.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lyx.changes b/lyx.changes index a4cc71c..7e7c111 100644 --- a/lyx.changes +++ b/lyx.changes @@ -15,7 +15,7 @@ Wed Sep 17 11:19:25 UTC 2014 - cornelis@solcon.nl * Bugfix release (for details see http://www.lyx.org/announce/2_1_2.txt or included ANNOUNCE file)) - Added file-devel to BuildRequires to provide magic.h - Changed most Requires to Recommends to give expert users more control, but still have them installed when default settings are used. -- Updated xdg-open patch +- Updated xdg-open patch (lyx-2.1.0-xdg_open.patch --> lyx-2.1.2-xdg_open.patch) - Removed deprecated --with-frontend=qt4 configure option. -------------------------------------------------------------------