From e92553c392ab37e66827d419a133e545e2cc6d8ff1a441133898700010c190a6 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 6 Mar 2019 09:46:27 +0000 Subject: [PATCH] - Simplify spec file OBS-URL: https://build.opensuse.org/package/show/Publishing/xmlto?expand=0&rev=30 --- xmlto.changes | 5 +++++ xmlto.spec | 28 ++++++---------------------- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/xmlto.changes b/xmlto.changes index 6e9781c..2b68c9e 100644 --- a/xmlto.changes +++ b/xmlto.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 6 09:45:26 UTC 2019 - Martin Pluskal + +- Simplify spec file + ------------------------------------------------------------------- Tue Mar 13 16:50:16 UTC 2018 - avindra@opensuse.org diff --git a/xmlto.spec b/xmlto.spec index 4a95a0c..ff1af0c 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -1,7 +1,7 @@ # # spec file for package xmlto # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,7 +22,7 @@ Release: 0 Summary: Tool for Converting XML Files to Various Formats License: GPL-2.0-or-later Group: Productivity/Publishing/XML -Url: https://pagure.io/xmlto/ +URL: https://pagure.io/xmlto/ Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2 Source10: README.SUSE Patch0: xmlto-nonvoid.patch @@ -31,24 +31,14 @@ Patch2: xmlto-codecleanup.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes BuildRequires: flex +BuildRequires: libxslt-tools BuildRequires: sgml-skel # We rely entirely on the DocBook XSL stylesheets! Requires: docbook-xsl-stylesheets >= 1.56.0 Requires: docbook_4 +Requires: libxslt-tools # For full functionality, we need passivetex. Recommends: texlive-xmltex >= 2007 -%if 0%{?suse_version} > 1210 -BuildRequires: libxslt-tools -Requires: libxslt-tools -%else -%if 0%{?suse_version} > 0 -BuildRequires: libxslt -Requires: libxslt -%else -BuildRequires: xsltproc -Requires: xsltproc -%endif -%endif %description This is a package for converting XML files to various formats using XSL @@ -63,12 +53,6 @@ for print output it makes use of passivetex. cp %{SOURCE10} . rm -f xmlif/xmlif.c -# make sure the buildrequires pulled in xsltproc -test -x %{_bindir}/xsltproc || { - echo "ERROR: buildrequires didn't install xsltproc" >&2 - exit 1 -} - %build %configure BASH=/bin/bash make %{?_smp_mflags} @@ -79,7 +63,7 @@ make check %{?_smp_mflags} %install %make_install install -d %{buildroot}%{_datadir}/xmlto/xsl -%fdupes '%{buildroot}%{_datadir}/xmlto' +%fdupes %{buildroot}%{_datadir}/xmlto %files %doc README.SUSE