From 93f1081831e0ada307cfba526df417cfdc04a2fd6b183e7c6f3609777d901ced Mon Sep 17 00:00:00 2001
From: Frank Sundermeyer <fs@suse.com>
Date: Tue, 23 Oct 2018 15:16:26 +0000
Subject: [PATCH] Spec-file and build environment fixes

OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=206
---
 daps-3.0.0.tar.bz2 |  4 ++--
 daps.spec          | 21 +++++++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/daps-3.0.0.tar.bz2 b/daps-3.0.0.tar.bz2
index 524cc1b..20c580b 100644
--- a/daps-3.0.0.tar.bz2
+++ b/daps-3.0.0.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4cb178ca20fe1865f6b9bc7707edad3175d33b9dcc6481feabf04bda503b162d
-size 2245473
+oid sha256:062eb5420d6995f4d179ed2faffbed265d9ae5055be3a9547d1084fe020a3501
+size 2387786
diff --git a/daps.spec b/daps.spec
index bb2fdaf..971684c 100644
--- a/daps.spec
+++ b/daps.spec
@@ -42,7 +42,7 @@ Release:        0
 %define daps_catalog   for-catalog-%{name}.xml
 
 Summary:        DocBook Authoring and Publishing Suite
-License:        GPL-2.0-only OR GPL-3.0-only
+License:        GPL-2.0 or GPL-3.0
 Group:          Productivity/Publishing/XML
 Url:            https://github.com/openSUSE/daps
 Source0:        %{name}-%{version}.tar.bz2
@@ -61,6 +61,7 @@ BuildRequires:  docbook_4
 BuildRequires:  fdupes
 BuildRequires:  ghostscript
 BuildRequires:  inkscape
+BuildRequires:  jing
 BuildRequires:  libxml2-tools
 BuildRequires:  libxslt
 BuildRequires:  libxslt-tools
@@ -75,6 +76,19 @@ BuildRequires:  xml-commons-jaxp-1.3-apis
 BuildRequires:  xmlgraphics-fop >= 0.94
 BuildRequires:  xmlstarlet
 
+# Asciidoctor is not available on Leap 42.3
+#  If we have asciidoctor we build the asciidoc manual
+#  for which we need docbook_5 and jing
+#
+%if 0%{?sle_version} == 120300 && 0%{?is_opensuse}
+Recommends:     rubygem(%{rb_default_ruby_abi}:asciidoctor)
+%else
+Requires:       rubygem(%{rb_default_ruby_abi}:asciidoctor)
+BuildRequires:  docbook_5
+BuildRequires:  jing
+BuildRequires:  rubygem(%{rb_default_ruby_abi}:asciidoctor)
+%endif
+
 #
 # In order to keep the requirements list as short as possible, only packages
 # needed to build EPUB, HTML and PDF are really required
@@ -109,7 +123,6 @@ Requires:       xml-commons-jaxp-1.3-apis
 Requires:       xmlgraphics-fop >= 0.94
 Requires:       xmlstarlet
 Requires:       zip
-Requires:       rubygem(%{rb_default_ruby_abi}:asciidoctor)
 
 Recommends:     aspell-en
 Recommends:     calibre
@@ -164,10 +177,6 @@ sed -i '1 s|/usr/bin/env python|/usr/bin/python|' libexec/daps-xmlwellformed
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# FIXME: temporary workaround for buildstep that is not executed... start workaround vvv
-sed -i 's_\(xml:base\)="[^"]*"_\1="file:///usr/share/daps/daps-xslt/"_g' $RPM_BUILD_ROOT/%{_sysconfdir}/xml/catalog.d/%{name}.xml
-# ^^^ end workaround
-
 # create symlinks:
 %fdupes -s $RPM_BUILD_ROOT/%{_datadir}