update to 2.1.2

OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=90
This commit is contained in:
Cor Blom 2014-09-17 11:39:08 +00:00 committed by Git OBS Bridge
parent 07a5fbeea2
commit 5b51927dda
5 changed files with 62 additions and 49 deletions

View File

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

View File

@ -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 @@

3
lyx-2.1.2.tar.xz Normal file
View File

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

View File

@ -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

View File

@ -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