From b596f94ea3a58d98321cb6bb1e959fee0ecf8966acc6bc0b5691bf96f34b4298 Mon Sep 17 00:00:00 2001
From: Cor Blom <cornelis@solcon.nl>
Date: Mon, 29 Jan 2018 21:03:41 +0000
Subject: [PATCH] - 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.

OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=137
---
 lyx-2.2.3.tar.xz        |   3 ---
 lyx-2.2.3.tar.xz.sig    | Bin 287 -> 0 bytes
 lyx-2.3.0rc2.tar.xz     |   3 +++
 lyx-2.3.0rc2.tar.xz.sig | Bin 0 -> 287 bytes
 lyx.changes             |  14 ++++++++++++++
 lyx.spec                |  31 +++++++------------------------
 6 files changed, 24 insertions(+), 27 deletions(-)
 delete mode 100644 lyx-2.2.3.tar.xz
 delete mode 100644 lyx-2.2.3.tar.xz.sig
 create mode 100644 lyx-2.3.0rc2.tar.xz
 create mode 100644 lyx-2.3.0rc2.tar.xz.sig

diff --git a/lyx-2.2.3.tar.xz b/lyx-2.2.3.tar.xz
deleted file mode 100644
index a12e05d..0000000
--- a/lyx-2.2.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4fcaeb7c202472d9ea21bf826fb30541015fef33e7217eda2be2b5d589c82b57
-size 15501856
diff --git a/lyx-2.2.3.tar.xz.sig b/lyx-2.2.3.tar.xz.sig
deleted file mode 100644
index 982dafc8d2fe1be6bffebd819bd7068564e8cd31fa25354818126fcedbedc12d..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 287
zcmV+)0pR|L0UQJX0RjL91p-+R={o=l2@u|TMEb}3I4!_T2mUn7#HnwjBSCbYH<d!*
zNW0GA0N;YKV2GJW$Ex?O!axz|Xnms*AW8Ps%EYbZv;McaVUpt$sJF!tA|q#?-H+WY
z8IeNGvudP(Q>FO9$@+LbLTTbXFyozMAZ|`){*mjMYHi&B3lT~m2q976NzbbCY5wR;
z76qt;?e+#WS4a%1Qi&ov)NePVN`;m~-@7iBi=TvY_nUcdjbF?aLjJz~!Fz5_WQ?T4
zO`kb`qaClrt;3e`jbixA;5?>C>H(tUp`;tkJA)23&U6DaFN~Y}kiYBeuR9EyYj#fI
lQ{4N{Tn30Jo+yoDlhgNkOwLRrr!>4!mQ@Y7w!Jr%DU~A3juHR>

diff --git a/lyx-2.3.0rc2.tar.xz b/lyx-2.3.0rc2.tar.xz
new file mode 100644
index 0000000..d71ba3d
--- /dev/null
+++ b/lyx-2.3.0rc2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ca46213e2dbf6f038c11ea6cee59248621b130d3c1773a0e48111839e19824d
+size 15745996
diff --git a/lyx-2.3.0rc2.tar.xz.sig b/lyx-2.3.0rc2.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..439b530f2fac6e93899823c7809f159450d095ca0d06254e690a4fc447d666ce
GIT binary patch
literal 287
zcmV+)0pR|L0UQJX0RjL91p-=bij)8f2@u|TMEb}3I4#Mv2mB9;<{D>fL4SZ2uYq_y
z@8_soUJj#?j{6y@vT~uyd8#DHs`ddN4Q?nznZI=e&DeMPzQ;A`VGOoayv~JeErx8q
zYW8_FWk5}0{mpu0P9uA{bU+R>v7lykO0fJOK;w2J^>6d^4mFtLckP9^1G4IHR)>db
z_7;?!Pd>F&e?f386{y@s3eOSV^b1N=w&Q6;u;6dM{yLS|)vG3|pYpZ!A$cOBMJW~x
zvz=o6EScH{O<J&aT-)Wn9XE|sL|GKjR%dv47o&7uDUks8lI2io^2^wEx|xURL9UK;
lsVm;o0y_xM=UTWd5O{@?*}4lAx#$ty^WjK|HpY%0u4-wLidX;u

literal 0
HcmV?d00001

diff --git a/lyx.changes b/lyx.changes
index daab016..f94eb55 100644
--- a/lyx.changes
+++ b/lyx.changes
@@ -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
 
diff --git a/lyx.spec b/lyx.spec
index e757e31..406ed34 100644
--- a/lyx.spec
+++ b/lyx.spec
@@ -1,7 +1,7 @@
 #
 # 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
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,16 +17,17 @@
 
 
 Name:           lyx
-Version:        2.2.3
+Version:        2.3.0
 Release:        0
+%define rversion 2.3.0rc2
 Summary:        WYSIWYM (What You See Is What You Mean) document processor
 License:        GPL-2.0+
 Group:          Productivity/Publishing/TeX/Frontends
 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/evel/lyx-2.3/lyx-2.3.0rc2/lyx-%{rversion}.tar.xz
 Source1:        lyxrc.dist
 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/evel/lyx-2.3/lyx-2.3.0rc2/lyx-%{rversion}.tar.xz.sig
 #!BuildIgnore: lyx
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -43,12 +44,7 @@ BuildRequires:  zlib-devel
 Requires:       ImageMagick
 Requires:       ghostscript
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} > 1325
 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(Qt5Core)
 BuildRequires:  pkgconfig(Qt5DBus)
@@ -59,14 +55,6 @@ BuildRequires:  pkgconfig(Qt5Sql)
 BuildRequires:  pkgconfig(Qt5Svg)
 BuildRequires:  pkgconfig(Qt5Widgets)
 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
 # 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
@@ -74,6 +62,8 @@ Recommends:     xindy
 Recommends:     texlive-algorithms
 Recommends:     texlive-arabi
 Recommends:     texlive-bezos
+Recommends:     texlive-biber
+Recommends:     texlive-bibtex8
 Recommends:     texlive-bibtopic
 Recommends:     texlive-braille
 Recommends:     texlive-collection-fontsrecommended
@@ -110,11 +100,6 @@ Recommends:     texlive-diagbox
 Recommends:     texlive-picinpar
 Recommends:     texlive-shapepar
 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
 LyX is a document processor that encourages an approach to writing
@@ -133,9 +118,7 @@ document under "Help" on the menubar.
 #./autogen.sh
 TEXMF=%{_datadir}/texmf
 %configure \
-%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse}
     --enable-qt5 \
-%endif
     --without-included-boost \
     --without-aspell \
     --with-hunspell \