Accepting request 570784 from Publishing

This version works better with Qt 5.10 than the previous one and is stable enough for daily use.

OBS-URL: https://build.opensuse.org/request/show/570784
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lyx?expand=0&rev=85
This commit is contained in:
Dominique Leuenberger 2018-01-30 14:44:09 +00:00 committed by Git OBS Bridge
commit 7174176f7d
6 changed files with 26 additions and 28 deletions

View File

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

Binary file not shown.

3
lyx-2.3.0rc2.tar.xz Normal file
View File

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

BIN
lyx-2.3.0rc2.tar.xz.sig Normal file

Binary file not shown.

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Jan 29 20:56:16 UTC 2018 - cornelis@solcon.nl
- Update to 2.3..0rc2:
This is a major feature release, with as major features:
* biblatex support
* improved quotation marks handling
* for more see: https://wiki.lyx.org/LyX/NewInLyX23
- Make texlive-biber and texlive-bibtex8 recommends (because of
added biblatex support)
- Clean up spec file: remove all references to older versions.
Because of the required automake version only Tumbleweed and 15
are supported.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun May 7 19:54:11 UTC 2017 - cornelis@solcon.nl Sun May 7 19:54:11 UTC 2017 - cornelis@solcon.nl

View File

@ -1,7 +1,7 @@
# #
# spec file for package lyx # spec file for package lyx
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,16 +17,17 @@
Name: lyx Name: lyx
Version: 2.2.3 Version: 2.3.0
Release: 0 Release: 0
%define rversion 2.3.0rc2
Summary: WYSIWYM (What You See Is What You Mean) document processor Summary: WYSIWYM (What You See Is What You Mean) document processor
License: GPL-2.0+ License: GPL-2.0+
Group: Productivity/Publishing/TeX/Frontends Group: Productivity/Publishing/TeX/Frontends
Url: http://www.lyx.org/ Url: http://www.lyx.org/
Source: ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/lyx-%{version}.tar.xz Source: ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/lyx-2.3.0rc2/lyx-%{rversion}.tar.xz
Source1: lyxrc.dist Source1: lyxrc.dist
Source2: lyx.keyring Source2: lyx.keyring
Source3: ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/lyx-%{version}.tar.xz.sig Source3: ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/lyx-2.3.0rc2/lyx-%{rversion}.tar.xz.sig
#!BuildIgnore: lyx #!BuildIgnore: lyx
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -43,12 +44,7 @@ BuildRequires: zlib-devel
Requires: ImageMagick Requires: ImageMagick
Requires: ghostscript Requires: ghostscript
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1325
BuildRequires: libboost_signals-devel BuildRequires: libboost_signals-devel
%else
BuildRequires: boost-devel
%endif
%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse}
BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5DBus)
@ -59,14 +55,6 @@ BuildRequires: pkgconfig(Qt5Sql)
BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(Qt5Xml)
%else
BuildRequires: libqt4-devel
%endif
%if 0%{?suse_version} < 1230
Requires: texlive-latex
Recommends: texlive-xetex
Recommends: xindy
%else
# Goal is to require/recommends (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 # 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 # I have ingored extra fonts and document classes
@ -74,6 +62,8 @@ Recommends: xindy
Recommends: texlive-algorithms Recommends: texlive-algorithms
Recommends: texlive-arabi Recommends: texlive-arabi
Recommends: texlive-bezos Recommends: texlive-bezos
Recommends: texlive-biber
Recommends: texlive-bibtex8
Recommends: texlive-bibtopic Recommends: texlive-bibtopic
Recommends: texlive-braille Recommends: texlive-braille
Recommends: texlive-collection-fontsrecommended Recommends: texlive-collection-fontsrecommended
@ -110,11 +100,6 @@ Recommends: texlive-diagbox
Recommends: texlive-picinpar Recommends: texlive-picinpar
Recommends: texlive-shapepar Recommends: texlive-shapepar
Recommends: texlive-sidecap 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
Suggests: texlive-bibtex8
%endif
%description %description
LyX is a document processor that encourages an approach to writing LyX is a document processor that encourages an approach to writing
@ -127,15 +112,14 @@ LyX can check the LaTeX installation by opening the LaTeX Configuration
document under "Help" on the menubar. document under "Help" on the menubar.
%prep %prep
%setup -q %setup -q -n %{name}-%{rversion}
%build %build
#./autogen.sh #./autogen.sh
TEXMF=%{_datadir}/texmf TEXMF=%{_datadir}/texmf
%configure \ %configure \
%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse} --enable-build-type=rel \
--enable-qt5 \ --enable-qt5 \
%endif
--without-included-boost \ --without-included-boost \
--without-aspell \ --without-aspell \
--with-hunspell \ --with-hunspell \