From 2da79a4c80332ce8609b7357721a13a97bc952a340240cf1f767d9c2354e172d Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 3 Dec 2019 09:39:08 +0000 Subject: [PATCH 1/5] Accepting request 752969 from home:StefanBruens:branches:devel:tools:scm - Depend on one of the DocBook stylesheets (4 or 5), prefer DocBook 4 for backwards compatibility. - Remove unnecessary docbook-xsl-stylesheets BuildRequires. OBS-URL: https://build.opensuse.org/request/show/752969 OBS-URL: https://build.opensuse.org/package/show/Publishing/xmlto?expand=0&rev=34 --- xmlto.changes | 7 +++++++ xmlto.spec | 9 +++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/xmlto.changes b/xmlto.changes index bc3d2af..bc98a3f 100644 --- a/xmlto.changes +++ b/xmlto.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 628d6af..a922a8e 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -28,15 +28,20 @@ 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 # We rely entirely on the DocBook XSL stylesheets! +%if 0%{suse_version} >= 1500 +Requires: (docbook-xsl-stylesheets >= 1.56.0 or docbook5-xsl-stylesheets >= 1.56.0) +Recommends: docbook-xsl-stylesheets +%else Requires: docbook-xsl-stylesheets >= 1.56.0 -Requires: docbook_4 +%endif Requires: libxslt-tools +# Used for validation (xmllint) +Recommends: libxml2-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 From 87f6cb4a9ce8db92c0aaf43b04b4d984fe4493c2abecfac3633d2c65cc195c7d Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 3 Dec 2019 09:41:50 +0000 Subject: [PATCH 2/5] - Modernise spec file OBS-URL: https://build.opensuse.org/package/show/Publishing/xmlto?expand=0&rev=35 --- xmlto.changes | 5 +++++ xmlto.spec | 17 +++++------------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/xmlto.changes b/xmlto.changes index bc98a3f..c0ffd42 100644 --- a/xmlto.changes +++ b/xmlto.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 3 09:40:00 UTC 2019 - Martin Pluskal + +- Modernise spec file + ------------------------------------------------------------------- Fri Nov 29 18:05:11 UTC 2019 - Stefan Brüns diff --git a/xmlto.spec b/xmlto.spec index a922a8e..d1c5896 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -1,7 +1,7 @@ # # spec file for package xmlto # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,18 +33,14 @@ BuildRequires: flex BuildRequires: libxslt-tools BuildRequires: sgml-skel # We rely entirely on the DocBook XSL stylesheets! -%if 0%{suse_version} >= 1500 Requires: (docbook-xsl-stylesheets >= 1.56.0 or docbook5-xsl-stylesheets >= 1.56.0) -Recommends: docbook-xsl-stylesheets -%else -Requires: docbook-xsl-stylesheets >= 1.56.0 -%endif Requires: libxslt-tools +Recommends: docbook-xsl-stylesheets # Used for validation (xmllint) Recommends: libxml2-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 @@ -52,16 +48,13 @@ stylesheets. As a processor it depends on xsltproc and as a formatter for print output it makes use of passivetex. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 cp %{SOURCE10} . rm -f xmlif/xmlif.c %build %configure BASH=/bin/bash -make %{?_smp_mflags} +%make_build %check make check %{?_smp_mflags} From bdc8b7f6bc73610e4e779df5525949785d9c69cddd845b72e018a6401dcdff6d Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 3 Dec 2019 11:48:24 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Publishing/xmlto?expand=0&rev=36 --- xmlto.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xmlto.spec b/xmlto.spec index d1c5896..e0d7bb0 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -32,10 +32,9 @@ 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 or docbook5-xsl-stylesheets >= 1.56.0) Requires: libxslt-tools -Recommends: docbook-xsl-stylesheets +# 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 # For full functionality, we need passivetex; but since most users are not happy with From 317b6528a6bed2224339344ec15b689dc812382e7fc05e8a335e30eda132cfcf Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 4 Dec 2019 08:40:00 +0000 Subject: [PATCH 4/5] 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} From 6d7414c650e77b3cce53674b6ad8deadd0cbe1a7552fddc2ea82d0dea48536b5 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 26 Feb 2024 15:06:33 +0000 Subject: [PATCH 5/5] Accepting request 1151327 from home:dimstar:rpm4.20:x Prepare for RPM 4.20 OBS-URL: https://build.opensuse.org/request/show/1151327 OBS-URL: https://build.opensuse.org/package/show/Publishing/xmlto?expand=0&rev=38 --- xmlto.changes | 6 ++++++ xmlto.spec | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xmlto.changes b/xmlto.changes index bc3d2af..64a689b 100644 --- a/xmlto.changes +++ b/xmlto.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 26 12:20:36 UTC 2024 - Dominique Leuenberger + +- Use %autosetup macro. Allows to eliminate the usage of deprecated + PatchN. + ------------------------------------------------------------------- Mon Mar 18 15:42:45 UTC 2019 - Dominique Leuenberger diff --git a/xmlto.spec b/xmlto.spec index 628d6af..87f2f86 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -47,10 +47,8 @@ stylesheets. As a processor it depends on xsltproc and as a formatter for print output it makes use of passivetex. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 + cp %{SOURCE10} . rm -f xmlif/xmlif.c