From dc70fa12dc5ce32771f1c9e37aca7995dace429f98ba08ef9974de8cd967d9c1 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 18 Dec 2009 12:34:07 +0000 Subject: [PATCH] Accepting request 26966 from Publishing Copy from Publishing/xmlto based on submit request 26966 from user keichwa OBS-URL: https://build.opensuse.org/request/show/26966 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmlto?expand=0&rev=8 --- xmlto-0.0.18.tar.bz2 | 3 -- ...sltopts.diff => xmlto-0.0.23-xsltopts.diff | 16 +++--- xmlto-0.0.23.tar.bz2 | 3 ++ xmlto-codecleanup.patch | 12 ++--- xmlto-find-cmd.diff | 13 ----- xmlto-nonvoid.patch | 12 ++--- xmlto.changes | 7 +++ xmlto.spec | 50 ++++--------------- 8 files changed, 39 insertions(+), 77 deletions(-) delete mode 100644 xmlto-0.0.18.tar.bz2 rename xmlto-0.0.18-xsltopts.diff => xmlto-0.0.23-xsltopts.diff (73%) create mode 100644 xmlto-0.0.23.tar.bz2 delete mode 100644 xmlto-find-cmd.diff diff --git a/xmlto-0.0.18.tar.bz2 b/xmlto-0.0.18.tar.bz2 deleted file mode 100644 index 19f7133..0000000 --- a/xmlto-0.0.18.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64db67e1a3b32fada20370792493c97fa9a37bc2dafc767603689036de9b344b -size 91275 diff --git a/xmlto-0.0.18-xsltopts.diff b/xmlto-0.0.23-xsltopts.diff similarity index 73% rename from xmlto-0.0.18-xsltopts.diff rename to xmlto-0.0.23-xsltopts.diff index 5110435..f357c4f 100644 --- a/xmlto-0.0.18-xsltopts.diff +++ b/xmlto-0.0.23-xsltopts.diff @@ -1,5 +1,5 @@ ---- xmlto-0.0.18/xmlto.in.~1~ 2004-01-02 13:03:24.000000000 +0100 -+++ xmlto-0.0.18/xmlto.in 2007-12-12 15:39:19.000000000 +0100 +--- xmlto.in.orig 2009-09-21 14:41:17.000000000 +0200 ++++ xmlto.in 2009-12-16 15:38:31.000000000 +0100 @@ -37,6 +37,7 @@ -o directory put output in the specified directory instead of the current working directory @@ -8,17 +8,17 @@ --extensions turn on stylesheet extensions for this tool chain --searchpath colon-separated list of fallback directories --skip-validation -@@ -156,7 +157,7 @@ +@@ -251,7 +252,7 @@ # Process any options ARGS=$(${GETOPT} \ -- --longoptions=help,version,extensions,searchpath:,skip-validation \ -+ --longoptions=help,version,extensions,searchpath:,skip-validation,xsltopts: \ +- --longoptions=help,version,extensions,searchpath:,skip-validation,stringparam:,noclean,noautosize,with-fop,with-dblatex \ ++ --longoptions=help,version,extensions,searchpath:,skip-validation,stringparam:,noclean,noautosize,with-fop,with-dblatex,xsltopts: \ -n xmlto -- x:m:o:p:v "$@") [ $? != 0 ] && { usage; exit 1; } eval set -- "$ARGS" -@@ -222,6 +223,10 @@ - SKIP_VALIDATION=1 +@@ -356,6 +357,10 @@ + fi shift ;; + --xsltopts) @@ -28,5 +28,3 @@ --) shift break - -Diff finished. Wed Dec 12 15:39:29 2007 diff --git a/xmlto-0.0.23.tar.bz2 b/xmlto-0.0.23.tar.bz2 new file mode 100644 index 0000000..d312198 --- /dev/null +++ b/xmlto-0.0.23.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9ffb2760ded55924708cf42f575aaa87cf38fce4d9019ad287213303a8cb1c4 +size 105201 diff --git a/xmlto-codecleanup.patch b/xmlto-codecleanup.patch index 965b6f6..07dda5c 100644 --- a/xmlto-codecleanup.patch +++ b/xmlto-codecleanup.patch @@ -1,6 +1,6 @@ ---- xmlif/xmlif.l -+++ xmlif/xmlif.l -@@ -30,7 +30,7 @@ +--- xmlif/xmlif.l.orig 2009-12-16 15:29:45.000000000 +0100 ++++ xmlif/xmlif.l 2009-12-16 15:45:19.000000000 +0100 +@@ -43,7 +43,7 @@ static char **selections; /* selection tokens */ static int nselections; /* number of selections */ @@ -9,7 +9,7 @@ static char *attribute; /* last attribute scanned */ struct stack_t { -@@ -71,7 +71,7 @@ +@@ -84,7 +84,7 @@ } } @@ -18,7 +18,7 @@ /* stash an attribute away for comparison */ { #ifdef DEBUG -@@ -163,7 +163,7 @@ +@@ -176,7 +176,7 @@ end->suppressed = suppress(attribute, val); } @@ -27,7 +27,7 @@ /* process tag */ { end->suppressed = end->matched; -@@ -217,9 +217,12 @@ +@@ -230,9 +230,12 @@ #include "config.h" diff --git a/xmlto-find-cmd.diff b/xmlto-find-cmd.diff deleted file mode 100644 index d0d88dc..0000000 --- a/xmlto-find-cmd.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- xmlto-0.0.18/xmlto.in.~1~ 2004-01-02 13:03:24.000000000 +0100 -+++ xmlto-0.0.18/xmlto.in 2006-08-28 11:39:28.000000000 +0200 -@@ -47,7 +47,7 @@ - EOF - if [ -d "$FORMAT_DIR" ] - then -- for source in $(${FIND} "$FORMAT_DIR" -type d -maxdepth 1) -+ for source in $(${FIND} "$FORMAT_DIR" -maxdepth 1 -type d) - do - if [ "$source" = "$FORMAT_DIR" ]; then continue; fi - - -Diff finished. Mon Aug 28 11:39:45 2006 diff --git a/xmlto-nonvoid.patch b/xmlto-nonvoid.patch index 98e134c..517096f 100644 --- a/xmlto-nonvoid.patch +++ b/xmlto-nonvoid.patch @@ -1,6 +1,6 @@ ---- xmlif/xmlif.c -+++ xmlif/xmlif.c -@@ -2413,6 +2413,7 @@ +--- xmlif/xmlif.c.orig 2009-03-16 17:53:22.000000000 +0100 ++++ xmlif/xmlif.c 2009-12-16 15:29:45.000000000 +0100 +@@ -2435,6 +2435,7 @@ } yylex(); @@ -8,9 +8,9 @@ } /* ---- xmlif/xmlif.l -+++ xmlif/xmlif.l -@@ -246,6 +246,7 @@ +--- xmlif/xmlif.l.orig 2009-03-16 17:52:01.000000000 +0100 ++++ xmlif/xmlif.l 2009-12-16 15:29:45.000000000 +0100 +@@ -259,6 +259,7 @@ } yylex(); diff --git a/xmlto.changes b/xmlto.changes index 96b2c00..2784cce 100644 --- a/xmlto.changes +++ b/xmlto.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 16 15:46:37 CET 2009 - ke@suse.de + +- Update to version 0.0.23; reported by Andreas Schwab. +- Drop obsolete patch. +- Rebuild old patches. + ------------------------------------------------------------------- Tue Apr 28 19:50:22 CEST 2009 - pth@suse.de diff --git a/xmlto.spec b/xmlto.spec index 450133c..3cd55d2 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -1,5 +1,5 @@ # -# spec file for package xmlto (Version 0.0.18) +# spec file for package xmlto (Version 0.0.23) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,17 +21,18 @@ Name: xmlto BuildRequires: docbook-xsl-stylesheets flex libxslt sgml-skel Summary: Tool for Converting XML Files to Various Formats -Version: 0.0.18 -Release: 185 -License: GPL v2 or later +Version: 0.0.23 +Release: 1 +License: GPLv2+ Group: Productivity/Publishing/XML Url: http://cyberelk.net/tim/xmlto/ -Source0: ftp://cyberelk.net/tim/data/xmlto/stable/%{name}-%{version}.tar.bz2 +Source0: https://fedorahosted.org/releases/x/m/xmlto/%{name}-%{version}.tar.bz2 Source10: %{name}-README.SuSE Patch: xmlto-nonvoid.patch Patch1: xmlto-0.0.18-overflow.patch -Patch2: xmlto-find-cmd.diff -Patch3: xmlto-0.0.18-xsltopts.diff +# is in +# Patch2: xmlto-find-cmd.diff +Patch3: xmlto-0.0.23-xsltopts.diff Patch4: xmlto-codecleanup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # We rely entirely on the DocBook XSL stylesheets! @@ -53,8 +54,8 @@ for print output it makes use of passivetex. %setup -q %patch %patch1 -p1 -%patch2 -p1 -%patch3 -p1 +# %patch2 -p1 +%patch3 -p0 %patch4 cp %{S:10} README.SuSE rm -f xmlif/xmlif.c @@ -83,34 +84,3 @@ rm -rf %{buildroot} %{_datadir}/xmlto %changelog -* Tue Apr 28 2009 pth@suse.de -- Fix comiler warnings. -- BuildRequire flex and remove xmlif.c to get it regenerated. -* Tue Sep 09 2008 ke@suse.de -- Improve README.SUSE; bnc#67190. -* Mon Mar 17 2008 werner@suse.de -- Use texlive-xmltex instead of passivetex -* Fri Dec 14 2007 ke@suse.de -- Require libxslt again. -* Wed Dec 12 2007 ke@suse.de -- Cleanup spec file. -- Apply xmlto-0.0.18-xsltopts.diff to provide a command line switch for - specifying the HTML output encoding; see # 197484 (thanks to Thomas - Schraitle). -* Mon Aug 28 2006 ke@suse.de -- Fix find argument sequence; reported by Marcus Rueckert [#201749]. -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Thu Sep 29 2005 dmueller@suse.de -- add norootforbuild -* Wed Jul 06 2005 ke@suse.de -- xmlto-0.0.18-overflow.patch: Include more *.h to avoid potential - buffer overflows. -* Thu Mar 03 2005 ke@suse.de -- Add README.SuSE to address issues producing PDF output; [# 67190]. -* Wed Oct 13 2004 ke@suse.de -- Add libgpg-error and libgcrypt to neededforbuild. -* Wed May 19 2004 ro@suse.de -- added return to non-void function (main) -* Tue Feb 24 2004 ke@suse.de -- New package: version 0.0.18. Proposed by Richard Bos [# 34918].