From 755d441a56ee62b9ec0398a75c4885b41f4280859df5855adba045ef1393ca35 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 14 Mar 2018 07:56:25 +0000 Subject: [PATCH] Accepting request 586502 from home:avindra - update to 0.0.28: - fix broken temp files removal - do not detect links browser as elinks - includes 0.0.27: - remove several bashisms in scripts - new option --profile for preprocessing documents with profiling stylesheet - fix several potential crashes in xmlif - cleanup with spec-cleaner - switch urls to new fedora upstream - patches: * rebase xmlto-xsltopts.patch * format xmlto-codecleanup.patch for -p1 * format xmlto-nonvoid.patch for -p1 * drop xmlto-overflow.patch (xmlif.c is regenerated anyway) * drop xmlto-lynx-empty-file.patch (obsolete) * renumber patches OBS-URL: https://build.opensuse.org/request/show/586502 OBS-URL: https://build.opensuse.org/package/show/Publishing/xmlto?expand=0&rev=28 --- xmlto-README.SUSE => README.SUSE | 0 xmlto-0.0.26.tar.bz2 | 3 --- xmlto-0.0.28.tar.bz2 | 3 +++ xmlto-codecleanup.patch | 6 ++--- xmlto-lynx-empty-file.patch | 14 ------------ xmlto-nonvoid.patch | 12 ++++------ xmlto-overflow.patch | 16 -------------- xmlto-xsltopts.patch | 15 ++++++------- xmlto.changes | 21 ++++++++++++++++++ xmlto.spec | 38 ++++++++++++++------------------ 10 files changed, 53 insertions(+), 75 deletions(-) rename xmlto-README.SUSE => README.SUSE (100%) delete mode 100644 xmlto-0.0.26.tar.bz2 create mode 100644 xmlto-0.0.28.tar.bz2 delete mode 100644 xmlto-lynx-empty-file.patch delete mode 100644 xmlto-overflow.patch diff --git a/xmlto-README.SUSE b/README.SUSE similarity index 100% rename from xmlto-README.SUSE rename to README.SUSE diff --git a/xmlto-0.0.26.tar.bz2 b/xmlto-0.0.26.tar.bz2 deleted file mode 100644 index ae2d50e..0000000 --- a/xmlto-0.0.26.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:efb49b2fb3bc27c1a1e24fe34abf19b6bf6cbb40844e6fd58034cdf21c54b5ec -size 119819 diff --git a/xmlto-0.0.28.tar.bz2 b/xmlto-0.0.28.tar.bz2 new file mode 100644 index 0000000..552d9eb --- /dev/null +++ b/xmlto-0.0.28.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1130df3a7957eb9f6f0d29e4aa1c75732a7dfb6d639be013859b5c7ec5421276 +size 127921 diff --git a/xmlto-codecleanup.patch b/xmlto-codecleanup.patch index 016fc9d..69aeaae 100644 --- a/xmlto-codecleanup.patch +++ b/xmlto-codecleanup.patch @@ -1,7 +1,5 @@ -Index: xmlif/xmlif.l -=================================================================== ---- xmlif/xmlif.l.orig -+++ xmlif/xmlif.l +--- a/xmlif/xmlif.l ++++ b/xmlif/xmlif.l @@ -43,7 +43,7 @@ static char **selections; /* selection tokens */ diff --git a/xmlto-lynx-empty-file.patch b/xmlto-lynx-empty-file.patch deleted file mode 100644 index 616e221..0000000 --- a/xmlto-lynx-empty-file.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: xmlto.in -=================================================================== ---- xmlto.in.orig -+++ xmlto.in -@@ -584,6 +584,9 @@ else - #xsltproc may return no file on empty input, touch it to have it for sure - touch "$XSLT_PROCESSED" - -+ #xsltproc may return no file on empty input, touch it to have it for sure -+ touch "$XSLT_PROCESSED" -+ - if [ $? == 4 ] - then - XSLTOPTS="${XSLTOPTS} --catalogs" diff --git a/xmlto-nonvoid.patch b/xmlto-nonvoid.patch index 787bf19..dc41620 100644 --- a/xmlto-nonvoid.patch +++ b/xmlto-nonvoid.patch @@ -1,7 +1,5 @@ -Index: xmlif/xmlif.c -=================================================================== ---- xmlif/xmlif.c.orig -+++ xmlif/xmlif.c +--- a/xmlif/xmlif.c ++++ b/xmlif/xmlif.c @@ -2435,6 +2435,7 @@ main(int argc, char *argv[]) } @@ -10,10 +8,8 @@ Index: xmlif/xmlif.c } /* -Index: xmlif/xmlif.l -=================================================================== ---- xmlif/xmlif.l.orig -+++ xmlif/xmlif.l +--- a/xmlif/xmlif.l ++++ b/xmlif/xmlif.l @@ -259,6 +259,7 @@ main(int argc, char *argv[]) } diff --git a/xmlto-overflow.patch b/xmlto-overflow.patch deleted file mode 100644 index 147a3a9..0000000 --- a/xmlto-overflow.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: xmlif/xmlif.c -=================================================================== ---- xmlif/xmlif.c.orig -+++ xmlif/xmlif.c -@@ -8,9 +8,10 @@ - #define YY_FLEX_MAJOR_VERSION 2 - #define YY_FLEX_MINOR_VERSION 5 - -+#include - #include - #include -- -+#include - - /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ - #ifdef c_plusplus diff --git a/xmlto-xsltopts.patch b/xmlto-xsltopts.patch index 6c46377..15af8bf 100644 --- a/xmlto-xsltopts.patch +++ b/xmlto-xsltopts.patch @@ -1,6 +1,5 @@ -diff -urN xmlto-0.0.26.old/xmlto.in xmlto-0.0.26/xmlto.in ---- xmlto-0.0.26.old/xmlto.in 2014-06-11 10:16:55.661844817 +0200 -+++ xmlto-0.0.26/xmlto.in 2014-06-11 10:18:02.362850985 +0200 +--- a/xmlto.in 2014-06-11 10:16:55.661844817 +0200 ++++ b/xmlto.in 2014-06-11 10:18:02.362850985 +0200 @@ -39,6 +39,7 @@ -o directory put output in the specified directory instead of the current working directory @@ -9,17 +8,17 @@ diff -urN xmlto-0.0.26.old/xmlto.in xmlto-0.0.26/xmlto.in --extensions turn on stylesheet extensions for this tool chain --noautosize do not autodetect paper size via locales or paperconf --noclean temp files are not deleted automatically -@@ -283,7 +284,7 @@ +@@ -282,7 +282,7 @@ # Process any options ARGS=$(${GETOPT} \ -- --longoptions=help,version,extensions,searchpath:,skip-validation,stringparam:,noclean,noautosize,noextensions,with-fop,with-dblatex \ -+ --longoptions=help,version,extensions,searchpath:,skip-validation,stringparam:,noclean,noautosize,noextensions,with-fop,with-dblatex,xsltopts: \ +- --longoptions=help,version,extensions,searchpath:,skip-validation,stringparam:,noclean,noautosize,noextensions,profile,with-fop,with-dblatex \ ++ --longoptions=help,version,extensions,searchpath:,skip-validation,stringparam:,noclean,noautosize,noextensions,profile,with-fop,with-dblatex,xsltopts: \ -n xmlto -- x:m:o:p:v "$@") [ $? != 0 ] && { usage; exit 1; } eval set -- "$ARGS" -@@ -389,6 +390,10 @@ - fi +@@ -391,6 +391,10 @@ + PROFILE=1 shift ;; + --xsltopts) diff --git a/xmlto.changes b/xmlto.changes index 1baa6b4..6e9781c 100644 --- a/xmlto.changes +++ b/xmlto.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Tue Mar 13 16:50:16 UTC 2018 - avindra@opensuse.org + +- update to 0.0.28: + - fix broken temp files removal + - do not detect links browser as elinks +- includes 0.0.27: + - remove several bashisms in scripts + - new option --profile for preprocessing documents with + profiling stylesheet + - fix several potential crashes in xmlif +- cleanup with spec-cleaner +- switch urls to new fedora upstream +- patches: + * rebase xmlto-xsltopts.patch + * format xmlto-codecleanup.patch for -p1 + * format xmlto-nonvoid.patch for -p1 + * drop xmlto-overflow.patch (xmlif.c is regenerated anyway) + * drop xmlto-lynx-empty-file.patch (obsolete) + * renumber patches + ------------------------------------------------------------------- Sun Oct 19 21:19:00 UTC 2014 - Led diff --git a/xmlto.spec b/xmlto.spec index 0931a9f..4a95a0c 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -1,7 +1,7 @@ # # spec file for package xmlto # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -17,19 +17,17 @@ Name: xmlto -Version: 0.0.26 +Version: 0.0.28 Release: 0 Summary: Tool for Converting XML Files to Various Formats -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Publishing/XML -Url: https://fedorahosted.org/xmlto/ -Source0: https://fedorahosted.org/releases/x/m/xmlto/%{name}-%{version}.tar.bz2 -Source10: %{name}-README.SUSE +Url: https://pagure.io/xmlto/ +Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2 +Source10: README.SUSE Patch0: xmlto-nonvoid.patch -Patch1: xmlto-overflow.patch -Patch3: xmlto-xsltopts.patch -Patch4: xmlto-codecleanup.patch -Patch5: xmlto-lynx-empty-file.patch +Patch1: xmlto-xsltopts.patch +Patch2: xmlto-codecleanup.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes BuildRequires: flex @@ -39,7 +37,6 @@ Requires: docbook-xsl-stylesheets >= 1.56.0 Requires: docbook_4 # For full functionality, we need passivetex. Recommends: texlive-xmltex >= 2007 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1210 BuildRequires: libxslt-tools Requires: libxslt-tools @@ -60,12 +57,10 @@ for print output it makes use of passivetex. %prep %setup -q -%patch0 -%patch1 -%patch3 -p1 -%patch4 -%patch5 -cp %{SOURCE10} README.SUSE +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +cp %{SOURCE10} . rm -f xmlif/xmlif.c # make sure the buildrequires pulled in xsltproc @@ -82,19 +77,18 @@ make %{?_smp_mflags} make check %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install install -d %{buildroot}%{_datadir}/xmlto/xsl %fdupes '%{buildroot}%{_datadir}/xmlto' %files -%defattr(-,root,root) %doc README.SUSE -%doc COPYING +%license COPYING %doc AUTHORS README ChangeLog FAQ THANKS NEWS %{_bindir}/xmlto %{_bindir}/xmlif -%doc %{_mandir}/man1/xmlto.1* -%doc %{_mandir}/man1/xmlif.1* +%{_mandir}/man1/xmlto.1%{?ext_man} +%{_mandir}/man1/xmlif.1%{?ext_man} %{_datadir}/xmlto %changelog