Hello community, here is the log from the commit of package xmlto for openSUSE:Factory checked in at 2012-06-15 15:39:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmlto (Old) and /work/SRC/openSUSE:Factory/.xmlto.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlto", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xmlto/xmlto.changes 2011-10-21 16:47:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xmlto.new/xmlto.changes 2012-06-15 16:31:16.000000000 +0200 @@ -1,0 +2,27 @@ +Wed Apr 18 16:47:31 UTC 2012 - [email protected] + +- update to 0.0.25 + - 2011-11-28 Ondrej Vasik <[email protected]> + * configure.in: detect grep location + * xmlto.in: use (fop/fop1).extensions parameter based on real + fop version + - 2011-07-14 Ondrej Vasik <[email protected]> + * format/docbook/epub: initial experimental support for + docbook to epub conversion + * configure.in: detect zip location + * xmlto.in: provide detected zip location to epub convertor + - 2011-07-07 Ondrej Vasik <[email protected]> + * README: Improve the readme file, create online manual + pages on project wiki + * xmlto.in: use backend extensions by default, provide + --noextensions to disable this + * doc/xmlto.xml: mention --noextensions option in documentation + - 2011-03-03 Ondrej Vasik <[email protected]> + * format/{docbook,xhtml}/txt: show the text-web-browser + converting command in verbose mode + - 2010-07-13 Ondrej Vasik <[email protected]> + * format/fo/{ps,dvi,pdf}: workaround passivetex limitation + for chapters titles starting with L (rhbz#526273) +- rebase patches (xmlto-overflow.patch, xmlto-xsltopts.patch). + +------------------------------------------------------------------- Old: ---- xmlto-0.0.18-overflow.patch xmlto-0.0.23-xsltopts.diff xmlto-0.0.23.tar.bz2 New: ---- xmlto-0.0.25.tar.bz2 xmlto-overflow.patch xmlto-xsltopts.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmlto.spec ++++++ --- /var/tmp/diff_new_pack.R6P8y6/_old 2012-06-15 16:31:17.000000000 +0200 +++ /var/tmp/diff_new_pack.R6P8y6/_new 2012-06-15 16:31:17.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xmlto # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%if 0%{?suse_version} < 1030 +%define dist_has_fdupes 0 +%else +%define dist_has_fdupes 1 +%endif # support SLE 11 %if !0%{?make_install:1} @@ -22,31 +27,35 @@ %endif Name: xmlto -Version: 0.0.23 -Release: 14 -License: GPL-2.0+ Summary: Tool for Converting XML Files to Various Formats -Url: https://fedorahosted.org/xmlto/ +License: GPL-2.0+ Group: Productivity/Publishing/XML +Version: 0.0.25 +Release: 0 +Url: https://fedorahosted.org/xmlto/ Source0: https://fedorahosted.org/releases/x/m/xmlto/%{name}-%{version}.tar.bz2 Source10: %{name}-README.SuSE Patch0: xmlto-nonvoid.patch -Patch1: xmlto-0.0.18-overflow.patch -Patch3: xmlto-0.0.23-xsltopts.diff +Patch1: xmlto-overflow.patch +Patch3: xmlto-xsltopts.patch Patch4: xmlto-codecleanup.patch Patch5: xmlto-lynx-empty-file.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: docbook-xsl-stylesheets -BuildRequires: fdupes BuildRequires: flex BuildRequires: libxslt BuildRequires: sgml-skel + +%if %{dist_has_fdupes} +BuildRequires: fdupes +%endif + # We rely entirely on the DocBook XSL stylesheets! Requires: docbook-xsl-stylesheets >= 1.56.0 Requires: docbook_4 Requires: xsltproc # For full functionality, we need passivetex. Recommends: texlive-xmltex >= 2007 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This is a package for converting XML files to various formats using XSL @@ -56,8 +65,8 @@ %prep %setup -q %patch0 -%patch1 -p1 -%patch3 -p0 +%patch1 +%patch3 %patch4 %patch5 cp %{SOURCE10} README.SuSE @@ -73,7 +82,9 @@ %install %make_install ! mkdir %{buildroot}%{_datadir}/xmlto/xsl +%if %{dist_has_fdupes} %{fdupes '%{buildroot}%{_datadir}/xmlto'} +%endif %files %defattr(-,root,root) ++++++ xmlto-0.0.23.tar.bz2 -> xmlto-0.0.25.tar.bz2 ++++++ ++++ 10015 lines of diff (skipped) ++++++ xmlto-codecleanup.patch ++++++ --- /var/tmp/diff_new_pack.R6P8y6/_old 2012-06-15 16:31:17.000000000 +0200 +++ /var/tmp/diff_new_pack.R6P8y6/_new 2012-06-15 16:31:17.000000000 +0200 @@ -1,5 +1,7 @@ ---- xmlif/xmlif.l.orig 2009-12-16 15:29:45.000000000 +0100 -+++ xmlif/xmlif.l 2009-12-16 15:45:19.000000000 +0100 +Index: xmlif/xmlif.l +=================================================================== +--- xmlif/xmlif.l.orig ++++ xmlif/xmlif.l @@ -43,7 +43,7 @@ static char **selections; /* selection tokens */ @@ -9,7 +11,7 @@ static char *attribute; /* last attribute scanned */ struct stack_t { -@@ -84,7 +84,7 @@ +@@ -84,7 +84,7 @@ static void pop_level(void) } } @@ -18,7 +20,7 @@ /* stash an attribute away for comparison */ { #ifdef DEBUG -@@ -176,7 +176,7 @@ +@@ -176,7 +176,7 @@ static void process_value(char *val) end->suppressed = suppress(attribute, val); } @@ -27,7 +29,7 @@ /* process <?xmlif else> tag */ { end->suppressed = end->matched; -@@ -230,9 +230,12 @@ +@@ -230,9 +230,12 @@ WS [ \t\n]* #include "config.h" ++++++ xmlto-lynx-empty-file.patch ++++++ --- /var/tmp/diff_new_pack.R6P8y6/_old 2012-06-15 16:31:17.000000000 +0200 +++ /var/tmp/diff_new_pack.R6P8y6/_new 2012-06-15 16:31:17.000000000 +0200 @@ -1,8 +1,10 @@ ---- xmlto.in 2011-10-19 16:02:34.130369281 +0200 -+++ xmlto.in 2011-10-19 16:03:24.226367583 +0200 -@@ -566,6 +566,9 @@ - -o "$XSLT_PROCESSED" "$STYLESHEET" "$INPUT_FILE" - fi +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" ++++++ xmlto-nonvoid.patch ++++++ --- /var/tmp/diff_new_pack.R6P8y6/_old 2012-06-15 16:31:17.000000000 +0200 +++ /var/tmp/diff_new_pack.R6P8y6/_new 2012-06-15 16:31:17.000000000 +0200 @@ -1,6 +1,8 @@ ---- 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 @@ +Index: xmlif/xmlif.c +=================================================================== +--- xmlif/xmlif.c.orig ++++ xmlif/xmlif.c +@@ -2435,6 +2435,7 @@ main(int argc, char *argv[]) } yylex(); @@ -8,9 +10,11 @@ } /* ---- 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 @@ +Index: xmlif/xmlif.l +=================================================================== +--- xmlif/xmlif.l.orig ++++ xmlif/xmlif.l +@@ -259,6 +259,7 @@ main(int argc, char *argv[]) } yylex(); ++++++ xmlto-overflow.patch ++++++ 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 ++++++ Index: xmlto.in =================================================================== --- xmlto.in.orig +++ xmlto.in @@ -38,6 +38,7 @@ OPTIONs are: -o directory put output in the specified directory instead of the current working directory -p postprocopts pass option to postprocessor + --xsltopts use xsltproc command line options --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 @@ -262,7 +263,7 @@ ZIP_PATH=@ZIP@ # Process any options ARGS=$(${GETOPT} \ - --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" @@ -383,6 +384,10 @@ while [ "$#" -gt "0" ]; do fi shift ;; + --xsltopts) + XSLTOPTS="$XSLTOPTS $2" + shift 2 + ;; --) shift break -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
