From 317b6528a6bed2224339344ec15b689dc812382e7fc05e8a335e30eda132cfcf Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 4 Dec 2019 08:40:00 +0000 Subject: [PATCH] osc copypac from project:Publishing package:xmlto revision:33 OBS-URL: https://build.opensuse.org/package/show/Publishing/xmlto?expand=0&rev=37 --- xmlto.changes | 12 ------------ xmlto.spec | 19 +++++++++++-------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/xmlto.changes b/xmlto.changes index c0ffd42..bc3d2af 100644 --- a/xmlto.changes +++ b/xmlto.changes @@ -1,15 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 3 09:40:00 UTC 2019 - Martin Pluskal - -- Modernise spec file - -------------------------------------------------------------------- -Fri Nov 29 18:05:11 UTC 2019 - Stefan Brüns - -- Depend on one of the DocBook stylesheets (4 or 5), prefer - DocBook 4 for backwards compatibility. -- Remove unnecessary docbook-xsl-stylesheets BuildRequires. - ------------------------------------------------------------------- Mon Mar 18 15:42:45 UTC 2019 - Dominique Leuenberger diff --git a/xmlto.spec b/xmlto.spec index e0d7bb0..628d6af 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -1,7 +1,7 @@ # # spec file for package xmlto # -# Copyright (c) 2019 SUSE LLC +# 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 @@ -28,18 +28,18 @@ Source10: README.SUSE Patch0: xmlto-nonvoid.patch Patch1: xmlto-xsltopts.patch Patch2: xmlto-codecleanup.patch +BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes BuildRequires: flex BuildRequires: libxslt-tools BuildRequires: sgml-skel -Requires: libxslt-tools # We rely entirely on the DocBook XSL stylesheets! -Recommends: (docbook-xsl-stylesheets >= 1.56.0 or docbook5-xsl-stylesheets >= 1.56.0) -# Used for validation (xmllint) -Recommends: libxml2-tools +Requires: docbook-xsl-stylesheets >= 1.56.0 +Requires: docbook_4 +Requires: libxslt-tools # For full functionality, we need passivetex; but since most users are not happy with # getting texlive installed, we only suggest it. -Suggests: texlive-xmltex >= 2007 +Suggests: texlive-xmltex >= 2007 %description This is a package for converting XML files to various formats using XSL @@ -47,13 +47,16 @@ stylesheets. As a processor it depends on xsltproc and as a formatter for print output it makes use of passivetex. %prep -%autosetup -p1 +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 cp %{SOURCE10} . rm -f xmlif/xmlif.c %build %configure BASH=/bin/bash -%make_build +make %{?_smp_mflags} %check make check %{?_smp_mflags}