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-0.0.26.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:efb49b2fb3bc27c1a1e24fe34abf19b6bf6cbb40844e6fd58034cdf21c54b5ec
-size 119819

xmlto-codecleanup.patch

@@ -1,7 +1,5 @@
-Index: xmlif/xmlif.l
+--- a/xmlif/xmlif.l
-===================================================================
++++ b/xmlif/xmlif.l
---- xmlif/xmlif.l.orig
-+++ xmlif/xmlif.l
 @@ -43,7 +43,7 @@
  
  static char **selections;	/* selection tokens */

xmlto-lynx-empty-file.patch

@@ -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"

xmlto-nonvoid.patch

@@ -1,7 +1,5 @@
-Index: xmlif/xmlif.c
+--- a/xmlif/xmlif.c
-===================================================================
++++ b/xmlif/xmlif.c
---- xmlif/xmlif.c.orig
-+++ xmlif/xmlif.c
 @@ -2435,6 +2435,7 @@ main(int argc, char *argv[])
  	}
  
@@ -10,10 +8,8 @@ Index: xmlif/xmlif.c
  }
  
  /*
-Index: xmlif/xmlif.l
+--- a/xmlif/xmlif.l
-===================================================================
++++ b/xmlif/xmlif.l
---- xmlif/xmlif.l.orig
-+++ xmlif/xmlif.l
 @@ -259,6 +259,7 @@ main(int argc, char *argv[])
  	}
  

xmlto-overflow.patch

@@ -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 <string.h>
- #include <stdio.h>
- #include <unistd.h>
--
-+#include <sys/socket.h>
- 
- /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
- #ifdef c_plusplus

xmlto-xsltopts.patch

@@ -1,6 +1,5 @@
-diff -urN xmlto-0.0.26.old/xmlto.in xmlto-0.0.26/xmlto.in
+--- a/xmlto.in	2014-06-11 10:16:55.661844817 +0200
---- xmlto-0.0.26.old/xmlto.in	2014-06-11 10:16:55.661844817 +0200
++++ b/xmlto.in	2014-06-11 10:18:02.362850985 +0200
-+++ xmlto-0.0.26/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,profile,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,xsltopts: \
  	-n xmlto -- x:m:o:p:v "$@")
  [ $? != 0 ] && { usage; exit 1; }
  eval set -- "$ARGS"
-@@ -389,6 +390,10 @@
+@@ -391,6 +391,10 @@
- 	fi
+ 	PROFILE=1
  	shift
  	;;
 +  --xsltopts)

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 <ledest@gmail.com>
 

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/
+Url:            https://pagure.io/xmlto/
-Source0:        https://fedorahosted.org/releases/x/m/xmlto/%{name}-%{version}.tar.bz2
+Source0:        https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
-Source10:       %{name}-README.SUSE
+Source10:       README.SUSE
 Patch0:         xmlto-nonvoid.patch
-Patch1:         xmlto-overflow.patch
+Patch1:         xmlto-xsltopts.patch
-Patch3:         xmlto-xsltopts.patch
+Patch2:         xmlto-codecleanup.patch
-Patch4:         xmlto-codecleanup.patch
-Patch5:         xmlto-lynx-empty-file.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
+%patch0 -p1
-%patch1
+%patch1 -p1
-%patch3 -p1
+%patch2 -p1
-%patch4
+cp %{SOURCE10} .
-%patch5
-cp %{SOURCE10} README.SUSE
 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*
+%{_mandir}/man1/xmlto.1%{?ext_man}
-%doc %{_mandir}/man1/xmlif.1*
+%{_mandir}/man1/xmlif.1%{?ext_man}
 %{_datadir}/xmlto
 
 %changelog