From 89b30546f8dba5fac7dbce696009e2065ff8b1fd3b4024c5556b072a6b05af3a Mon Sep 17 00:00:00 2001
From: Cor Blom <cornelis@solcon.nl>
Date: Fri, 26 Aug 2016 21:51:56 +0000
Subject: [PATCH 1/4] - Added convington-fix.diff to fix regression in
 linguistics   module (http://www.lyx.org/trac/ticket/10340)

OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=119
---
 covington-fix.diff | 19 +++++++++++++++++++
 lyx.changes        |  6 ++++++
 lyx.spec           |  3 +++
 3 files changed, 28 insertions(+)
 create mode 100644 covington-fix.diff

diff --git a/covington-fix.diff b/covington-fix.diff
new file mode 100644
index 0000000..7b6e1be
--- /dev/null
+++ b/covington-fix.diff
@@ -0,0 +1,19 @@
+Index: lib/layouts/linguistics.module
+===================================================================
+--- lib/layouts/linguistics.module	(revision 9fbe75bea9ef3f9d484bb0e69ea9c08d2d34a2f0)
++++ lib/layouts/linguistics.module	(revision c0f5c1dd9f09df4d880a1a3fb77418abaf43f723)
+@@ -36,5 +36,5 @@
+ 	\@ifundefined{covexample}{%
+ 	    \newenvironment{covexample}{\begin{example}}{\end{example}}%
+-	}
++	}{}
+ 	EndPreamble
+ 	Category              Linguistics
+@@ -57,5 +57,5 @@
+ 	\@ifundefined{covexamples}{%
+ 	    \newenvironment{covexamples}{\begin{examples}}{\end{examples}}%
+-	}
++	}{}
+ 	EndPreamble
+ End
+
diff --git a/lyx.changes b/lyx.changes
index dd16f1a..4d658d9 100644
--- a/lyx.changes
+++ b/lyx.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 26 21:50:40 UTC 2016 - cornelis@solcon.nl
+
+- Added convington-fix.diff to fix regression in linguistics
+  module (http://www.lyx.org/trac/ticket/10340)
+
 -------------------------------------------------------------------
 Mon Jul 25 20:13:57 UTC 2016 - cornelis@solcon.nl
 
diff --git a/lyx.spec b/lyx.spec
index 00c0091..8fc6a75 100644
--- a/lyx.spec
+++ b/lyx.spec
@@ -53,6 +53,8 @@ Source:         ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/lyx-%{version}.tar.xz
 Source1:        lyxrc.dist
 Source2:        lyx.keyring
 Source3:        ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/lyx-%{version}.tar.xz.sig
+# PATCH-FIX-UPSTREAM; http://www.lyx.org/trac/ticket/10340 fix for2.2.2
+Patch0:         covington-fix.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       ImageMagick
 Requires:       ghostscript
@@ -121,6 +123,7 @@ document under "Help" on the menubar.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 #./autogen.sh

From 5e50c7cfb215050088e672f9c0f31e7b3b18dc0b4fbb9bffe48374efc49ca24c Mon Sep 17 00:00:00 2001
From: Cor Blom <cornelis@solcon.nl>
Date: Fri, 26 Aug 2016 21:56:05 +0000
Subject: [PATCH 2/4] OBS-URL:
 https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=120

---
 lyx.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lyx.spec b/lyx.spec
index 8fc6a75..c3c8d4a 100644
--- a/lyx.spec
+++ b/lyx.spec
@@ -123,7 +123,7 @@ document under "Help" on the menubar.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0
 
 %build
 #./autogen.sh

From 612deed81295909aeb5bdd616f21a05b57f024ea55a770caffbb6bc41c933c7d Mon Sep 17 00:00:00 2001
From: Cor Blom <cornelis@solcon.nl>
Date: Fri, 26 Aug 2016 22:30:31 +0000
Subject: [PATCH 3/4] - Added Recommends: texlive-forest, required by the
 linguistics   manual - Added Recommends: texlive-tcolorbox, required by
 colored boxes   manual

OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=121
---
 lyx.changes | 4 ++++
 lyx.spec    | 1 +
 2 files changed, 5 insertions(+)

diff --git a/lyx.changes b/lyx.changes
index 4d658d9..48a4089 100644
--- a/lyx.changes
+++ b/lyx.changes
@@ -3,6 +3,10 @@ Fri Aug 26 21:50:40 UTC 2016 - cornelis@solcon.nl
 
 - Added convington-fix.diff to fix regression in linguistics
   module (http://www.lyx.org/trac/ticket/10340)
+- Added Recommends: texlive-forest, required by the linguistics
+  manual 
+- Added Recommends: texlive-tcolorbox, required by colored boxes
+  manual
 
 -------------------------------------------------------------------
 Mon Jul 25 20:13:57 UTC 2016 - cornelis@solcon.nl
diff --git a/lyx.spec b/lyx.spec
index c3c8d4a..697f6b3 100644
--- a/lyx.spec
+++ b/lyx.spec
@@ -93,6 +93,7 @@ Recommends:     texlive-prettyref
 Recommends:     texlive-refstyle
 Recommends:     texlive-rotfloat
 Recommends:     texlive-splitindex
+Recommends:     texlive-tcolorbox
 Recommends:     texlive-textgreek
 Recommends:     texlive-units
 Recommends:     texlive-wrapfig

From 1dd1f4ff33b9fe2bec1b6ee4daa81812c8e5f5436ef0135ef987ebbc422bc211 Mon Sep 17 00:00:00 2001
From: Cor Blom <cornelis@solcon.nl>
Date: Sat, 27 Aug 2016 11:04:05 +0000
Subject: [PATCH 4/4] OBS-URL:
 https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=122

---
 lyx.changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lyx.changes b/lyx.changes
index 48a4089..0852785 100644
--- a/lyx.changes
+++ b/lyx.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Fri Aug 26 21:50:40 UTC 2016 - cornelis@solcon.nl
 
-- Added convington-fix.diff to fix regression in linguistics
+- Added covington-fix.diff to fix regression in linguistics
   module (http://www.lyx.org/trac/ticket/10340)
 - Added Recommends: texlive-forest, required by the linguistics
   manual