Hello community, here is the log from the commit of package xmlto for openSUSE:Factory checked in at 2014-06-16 21:43:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmlto (Old) and /work/SRC/openSUSE:Factory/.xmlto.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlto" Changes: -------- --- /work/SRC/openSUSE:Factory/xmlto/xmlto.changes 2012-12-19 14:11:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xmlto.new/xmlto.changes 2014-06-16 21:43:38.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Jun 11 08:24:10 UTC 2014 - [email protected] + +- Version bump to 0.0.26: + - --searchpath option no longer produces warning + about local builtin used outside the function + (debian #652974) + - fix build with automake 1.13+ + - fix noextensions option recognition + - handle used css list in epub format +- Rename SUSE readme to xmlto-README.SUSE to fix capitalization +- Rebase xmlto-xsltopts.patch to apply to latest release. + +------------------------------------------------------------------- Old: ---- xmlto-0.0.25.tar.bz2 xmlto-README.SuSE New: ---- xmlto-0.0.26.tar.bz2 xmlto-README.SUSE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmlto.spec ++++++ --- /var/tmp/diff_new_pack.73aFYL/_old 2014-06-16 21:43:40.000000000 +0200 +++ /var/tmp/diff_new_pack.73aFYL/_new 2014-06-16 21:43:40.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xmlto # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -16,62 +16,42 @@ # -%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} -%define make_install %{makeinstall} -%endif - Name: xmlto +Version: 0.0.26 +Release: 0 Summary: Tool for Converting XML Files to Various Formats 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 +Source10: %{name}-README.SUSE Patch0: xmlto-nonvoid.patch 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: 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 +# For full functionality, we need passivetex. +Recommends: texlive-xmltex >= 2007 +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1210 -Requires: libxslt-tools BuildRequires: libxslt-tools -%else -%if 0%{?suse_version} >= 1210 -Requires: libxslt1 -BuildRequires: libxslt1 +Requires: libxslt-tools %else %if 0%{?suse_version} > 0 -Requires: libxslt BuildRequires: libxslt +Requires: libxslt %else BuildRequires: xsltproc Requires: xsltproc %endif %endif -%endif -# For full functionality, we need passivetex. -Recommends: texlive-xmltex >= 2007 %description This is a package for converting XML files to various formats using XSL @@ -82,14 +62,14 @@ %setup -q %patch0 %patch1 -%patch3 +%patch3 -p1 %patch4 %patch5 -cp %{SOURCE10} README.SuSE +cp %{SOURCE10} README.SUSE rm -f xmlif/xmlif.c # make sure the buildrequires pulled in xsltproc -test -x /usr/bin/xsltproc || { +test -x %{_bindir}/xsltproc || { echo "ERROR: buildrequires didn't install xsltproc" >&2 exit 1 } @@ -99,18 +79,16 @@ make %{?_smp_mflags} %check -make check +make check %{?_smp_mflags} %install -%make_install -%__install -d %{buildroot}%{_datadir}/xmlto/xsl -%if %{dist_has_fdupes} -%{fdupes '%{buildroot}%{_datadir}/xmlto'} -%endif +make DESTDIR=%{buildroot} install %{?_smp_mflags} +install -d %{buildroot}%{_datadir}/xmlto/xsl +%fdupes '%{buildroot}%{_datadir}/xmlto' %files %defattr(-,root,root) -%doc README.SuSE +%doc README.SUSE %doc COPYING %doc AUTHORS README ChangeLog FAQ THANKS NEWS %{_bindir}/xmlto ++++++ xmlto-0.0.25.tar.bz2 -> xmlto-0.0.26.tar.bz2 ++++++ ++++ 3258 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmlto-0.0.25/ChangeLog new/xmlto-0.0.26/ChangeLog --- old/xmlto-0.0.25/ChangeLog 2011-11-28 15:21:52.000000000 +0100 +++ new/xmlto-0.0.26/ChangeLog 2014-04-05 15:05:26.000000000 +0200 @@ -1,3 +1,24 @@ +2013-01-07 Ondrej Vasik <[email protected]> + * configure.in: fix build with automake 1.13+ + * format/docbook/epub: create dir for the css lists + +2012-12-20 Ondrej Vasik <[email protected]> + * configure.in: detect locations of sed/grep tools + * xmlto.in: handle detected sed and grep path variables + * format/fo/*: use variables for sed/grep instead of tool names + +2012-12-20 Kacper Perschke <[email protected]> + * format/docbook/epub: handle used css lists in epub format + +2012-09-02 Ondrej Vasik <[email protected]> + * xmlto.in: recognize documented noextensions parameter in + getopt + +2011-01-02 Ondrej Vasik <[email protected]> + * xmlto.in: move searchpath computing into a function to + prevent shell warning about local builtin used outside the + function (debian #652974) + 2011-11-28 Ondrej Vasik <[email protected]> * configure.in: detect grep location * xmlto.in: use (fop/fop1).extensions parameter based on real diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmlto-0.0.25/NEWS new/xmlto-0.0.26/NEWS --- old/xmlto-0.0.25/NEWS 2011-12-01 16:56:13.000000000 +0100 +++ new/xmlto-0.0.26/NEWS 2014-04-05 15:06:22.000000000 +0200 @@ -1,5 +1,13 @@ Xmlto news ---------- +0.0.26 (stable) + - --searchpath option no longer produces warning + about local builtin used outside the function + (debian #652974) + - fix build with automake 1.13+ + - fix noextensions option recognition + - handle used css list in epub format + 0.0.25 (stable) - prevent possible collisions in manpage generation - fix broken fop/fop1 extensions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmlto-0.0.25/THANKS new/xmlto-0.0.26/THANKS --- old/xmlto-0.0.25/THANKS 2011-12-01 16:47:29.000000000 +0100 +++ new/xmlto-0.0.26/THANKS 2013-01-07 08:34:12.000000000 +0100 @@ -18,3 +18,7 @@ Nathan Phillip Brink <[email protected]> Christopher Yeleighton <[email protected]> Mike Frysinger <[email protected]> +Cyril Brulebois <[email protected]> +Matthias Andree <[email protected]> +Kacper Perschke <[email protected]> +Marko Lindqvist <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmlto-0.0.25/compile new/xmlto-0.0.26/compile --- old/xmlto-0.0.25/compile 2010-06-23 10:35:03.000000000 +0200 +++ new/xmlto-0.0.26/compile 2012-12-10 14:54:41.000000000 +0100 @@ -1,10 +1,9 @@ #! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. +# Wrapper for compilers which do not understand '-c -o'. -scriptversion=2009-10-06.20; # UTC +scriptversion=2012-03-05.13; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software -# Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -29,21 +28,219 @@ # bugs to <[email protected]> or send patches to # <[email protected]>. +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. +right script to run: please start by reading the file 'INSTALL'. Report bugs to <[email protected]>. EOF @@ -53,11 +250,13 @@ echo "compile $scriptversion" exit $? ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; esac ofile= cfile= -eat= for arg do @@ -66,8 +265,8 @@ else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) @@ -94,10 +293,10 @@ done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a + # If no '-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also + # '.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -106,7 +305,7 @@ cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# Note: use '[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmlto-0.0.25/configure.in new/xmlto-0.0.26/configure.in --- old/xmlto-0.0.25/configure.in 2011-12-01 16:49:00.000000000 +0100 +++ new/xmlto-0.0.26/configure.in 2014-04-05 15:05:54.000000000 +0200 @@ -1,7 +1,7 @@ -AC_INIT(xmlto, 0.0.25) +AC_INIT(xmlto, 0.0.26) AC_CONFIG_SRCDIR(xmlto.spec.in) AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6]) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) AC_PROG_CC AM_PROG_CC_C_O @@ -112,6 +112,9 @@ AC_ARG_VAR([GREP], [Name and path of a GNU grep binary.]) AC_PATH_PROG([GREP], [grep], [grep]) +AC_ARG_VAR([SED], [Name and path of a GNU sed binary.]) +AC_PATH_PROG([SED], [sed], [sed]) + AC_ARG_VAR([GCP], [Name and path of a GNU cp binary (need at least -P)]) AC_PATH_PROG([GCP], [cp], [cp]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmlto-0.0.25/doc/xmlto.xml new/xmlto-0.0.26/doc/xmlto.xml --- old/xmlto-0.0.25/doc/xmlto.xml 2011-12-01 16:54:29.000000000 +0100 +++ new/xmlto-0.0.26/doc/xmlto.xml 2011-12-03 08:05:03.000000000 +0100 @@ -263,7 +263,7 @@ <varlistentry> <term><option>--noautosize</option></term> <listitem> - <para> By default, some XSL variables are overriden + <para> By default, some XSL variables are overridden by autodetection (<varname>page.width</varname> and <varname>page.height</varname> for <application>paperconf</application> (libpaper) use, <varname>paper.type</varname> for locale-based diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmlto-0.0.25/format/docbook/epub new/xmlto-0.0.26/format/docbook/epub --- old/xmlto-0.0.25/format/docbook/epub 2011-07-14 12:30:41.000000000 +0200 +++ new/xmlto-0.0.26/format/docbook/epub 2012-12-20 15:24:45.000000000 +0100 @@ -18,6 +18,14 @@ then echo >&2 "Creating epub file" fi + INPUT_DIR=`dirname $INPUT_FILE` + CSS_DEST_DIR=$PWD/OEBPS + mkdir $PWD/OEBPS + USED_CSS_LIST=`${GREP_PATH} 'link rel="stylesheet"' $CSS_DEST_DIR/*.html | ${SED_PATH} -e's/.*<link rel="stylesheet" type="text\/css" href="\(.*\.css\)"\/>.*/\1/' | uniq` + for CSS_SOURCE in $USED_CSS_LIST + do + ${GCP_PATH:-cp} -R -P -p -- $INPUT_DIR/$CSS_SOURCE $CSS_DEST_DIR/ + done echo "application/epub+zip" > mimetype EPUB_NAME=$(basename "${XSLT_PROCESSED%.*}").epub [ -e "$XSLT_PROCESSED" ] && rm "$XSLT_PROCESSED" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmlto-0.0.25/format/fo/dvi new/xmlto-0.0.26/format/fo/dvi --- old/xmlto-0.0.25/format/fo/dvi 2011-03-03 16:19:13.000000000 +0100 +++ new/xmlto-0.0.26/format/fo/dvi 2012-12-20 14:51:51.000000000 +0100 @@ -15,7 +15,7 @@ # Also work around stupid tetex limitation with long lines (rhbz #101055) # and workaround passivetex limitation for chapter titles starting with L # (rhbz #526273) - sed -e "s,/>,/>\n,g" \ + ${SED_PATH} -e "s,/>,/>\n,g" \ -e "s,block>,&\n,g" "$XSLT_PROCESSED" >tmp.fo OUT=output TEXINPUTS="$(dirname "$INPUT_FILE")::$SEARCHPATH" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmlto-0.0.25/format/fo/pdf new/xmlto-0.0.26/format/fo/pdf --- old/xmlto-0.0.25/format/fo/pdf 2011-12-01 16:51:31.000000000 +0100 +++ new/xmlto-0.0.26/format/fo/pdf 2012-12-20 14:52:27.000000000 +0100 @@ -17,7 +17,7 @@ # Also work around stupid tetex limitation with long lines # (rhbz #101055) and workaround passivetex limitation for chapter # titles starting with L (rhbz #526273) - sed -e "s,/>,/>\n,g" \ + ${SED_PATH} -e "s,/>,/>\n,g" \ -e "s,block>,&\n,g" "$XSLT_PROCESSED" >tmp.fo OUT=output TEXINPUTS="$(dirname "$INPUT_FILE")::$SEARCHPATH" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmlto-0.0.25/format/fo/ps new/xmlto-0.0.26/format/fo/ps --- old/xmlto-0.0.25/format/fo/ps 2011-12-01 16:52:08.000000000 +0100 +++ new/xmlto-0.0.26/format/fo/ps 2012-12-20 14:58:29.000000000 +0100 @@ -12,7 +12,7 @@ # Also work around stupid tetex limitation with long lines # (rhbz #101055) and workaround passivetex limitation for chapter # titles starting with L (rhbz #526273) - sed -e "s,/>,/>\n,g" \ + ${SED_PATH} -e "s,/>,/>\n,g" \ -e "s,block>,&\n,g" "$XSLT_PROCESSED" >tmp.fo OUT=output diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmlto-0.0.25/man/man1/xmlto.1 new/xmlto-0.0.26/man/man1/xmlto.1 --- old/xmlto-0.0.25/man/man1/xmlto.1 2011-12-01 16:58:50.000000000 +0100 +++ new/xmlto-0.0.26/man/man1/xmlto.1 2014-04-05 15:08:42.000000000 +0200 @@ -1,7 +1,7 @@ '\" t .\" Title: xmlto .\" Author: -.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> +.\" Generator: DocBook XSL Stylesheets v1.78.0 <http://docbook.sf.net/> .\" Date: November 2011 .\" Manual: Reference .\" Source: xmlto 0.0.25 @@ -186,7 +186,7 @@ .PP \fB\-\-noautosize\fR .RS 4 -By default, some XSL variables are overriden by autodetection (\fIpage\&.width\fR +By default, some XSL variables are overridden by autodetection (\fIpage\&.width\fR and \fIpage\&.height\fR for diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmlto-0.0.25/missing new/xmlto-0.0.26/missing --- old/xmlto-0.0.25/missing 2010-06-23 10:35:03.000000000 +0200 +++ new/xmlto-0.0.26/missing 2012-12-10 14:54:41.000000000 +0100 @@ -1,10 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.18; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -26,7 +25,7 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi @@ -34,7 +33,7 @@ sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' sed_minuso='s/.* -o \([^ ]*\).*/\1/p' -# In the cases where this matters, `missing' is being run in the +# In the cases where this matters, 'missing' is being run in the # srcdir already. if test -f configure.ac; then configure_ac=configure.ac @@ -65,7 +64,7 @@ echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an error status if there is no known handling for PROGRAM. Options: @@ -74,21 +73,20 @@ --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' + aclocal touch file 'aclocal.m4' + autoconf touch file 'configure' + autoheader touch file 'config.h.in' autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c + automake touch all 'Makefile.in' files + bison create 'y.tab.[ch]', if possible, from existing .[ch] + flex create 'lex.yy.c', if possible, from existing .c help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c + lex create 'lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + yacc create 'y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <[email protected]>." exit $? @@ -100,8 +98,8 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; @@ -122,22 +120,13 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 elif test "x$2" = "x--version" || test "x$2" = "x--help"; then # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether + # running '$TOOL --version' or '$TOOL --help' to check whether # $TOOL exists and not knowing $TOOL uses missing. exit 1 fi @@ -149,27 +138,27 @@ case $program in aclocal*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from +WARNING: '$1' is $msg. You should only need it if + you modified 'acinclude.m4' or '${configure_ac}'. You might want + to install the Automake and Perl packages. Grab them from any GNU archive site." touch aclocal.m4 ;; autoconf*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU +WARNING: '$1' is $msg. You should only need it if + you modified '${configure_ac}'. You might want to install the + Autoconf and GNU m4 packages. Grab them from any GNU archive site." touch configure ;; autoheader*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them +WARNING: '$1' is $msg. You should only need it if + you modified 'acconfig.h' or '${configure_ac}'. You might want + to install the Autoconf and GNU m4 packages. Grab them from any GNU archive site." files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" @@ -186,9 +175,9 @@ automake*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. +WARNING: '$1' is $msg. You should only need it if + you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. + You might want to install the Automake and Perl packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | sed 's/\.am$/.in/' | @@ -197,10 +186,10 @@ autom4te*) echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. +WARNING: '$1' is needed, but is $msg. You might have modified some files without having the proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU + You can get '$1' as part of Autoconf from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` @@ -220,13 +209,13 @@ bison*|yacc*) echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package +WARNING: '$1' $msg. You should only need it if + you modified a '.y' file. You may need the Bison package in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." + Bison from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -250,13 +239,13 @@ lex*|flex*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package +WARNING: '$1' is $msg. You should only need it if + you modified a '.l' file. You may need the Flex package in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." + Flex from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -273,10 +262,10 @@ help2man*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if +WARNING: '$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." + Help2man package in order for those modifications to take + effect. You can get Help2man from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -291,12 +280,12 @@ makeinfo*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file +WARNING: '$1' is $msg. You should only need it if + you modified a '.texi' or '.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." + call might also be the consequence of using a buggy 'make' (AIX, + DU, IRIX). You might want to install the Texinfo package or + the GNU make package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -318,49 +307,14 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. +WARNING: '$1' is needed, and is $msg. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, + proper tools for further handling them. Check the 'README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." + some other package would contain this missing '$1' program." exit 1 ;; esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmlto-0.0.25/xmlto.in new/xmlto-0.0.26/xmlto.in --- old/xmlto-0.0.25/xmlto.in 2011-11-29 12:49:57.000000000 +0100 +++ new/xmlto-0.0.26/xmlto.in 2012-12-20 14:51:24.000000000 +0100 @@ -23,6 +23,7 @@ GETOPT=@GETOPT@ # a getopt that supports --longoptions TAIL=@TAIL@ # a tail that supports -n (posix) GREP=@GREP@ # GNU grep, for searching patterns +SED=@SED@ # GNU sed, for modification of patterns version () { echo "@PACKAGE@ version @VERSION@" @@ -95,6 +96,24 @@ fi } +compute_searchpath () { + local oldIFS="${IFS}" + IFS=":" + for asearchpath in "$1"; do + # wrangle relative paths into absolute ones so that the user + # isn't surprised if he does ``--searchpath .'' + case "${asearchpath}" in + /*) ;; + *) asearchpath="${PWD}/${asearchpath}" ;; + esac + SEARCHPATH="${SEARCHPATH}${XML_SEARCHPATH_SEPARATOR}${asearchpath}" + # we only need a colon if more than one path is in the searchpath + # and only after the first iteration. + XML_SEARCHPATH_SEPARATOR=":" + done + IFS="${oldIFS}" +} + # Allow FORMAT_DIR to be over-ridden, so that we can be # run from the build directory. prefix=@prefix@ @@ -258,11 +277,13 @@ W3M_PATH=@W3M@ LYNX_PATH=@LYNX@ GCP_PATH=@GCP@ +SED_PATH=@SED@ +GREP_PATH=@GREP@ 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,noextensions,with-fop,with-dblatex \ -n xmlto -- x:m:o:p:v "$@") [ $? != 0 ] && { usage; exit 1; } eval set -- "$ARGS" @@ -322,22 +343,7 @@ shift ;; --searchpath) - local oldIFS="${IFS}" - IFS=":" - for asearchpath in "$2"; do - # wrangle relative paths into absolute ones so that the user - # isn't surprised if he does ``--searchpath .'' - case "${asearchpath}" in - /*) ;; - *) asearchpath="${PWD}/${asearchpath}" ;; - esac - SEARCHPATH="${SEARCHPATH}${XML_SEARCHPATH_SEPARATOR}${asearchpath}" - # we only need a colon if more than one path is in the searchpath - # and only after the first iteration. - XML_SEARCHPATH_SEPARATOR=":" - done - IFS="${oldIFS}" - + compute_searchpath "$2" # This is the cleanest method I can think of, but requires calls to # xmllint and xsltproc to be run through eval --ohnobinki [ -n "${SEARCHPATH}" ] && SEARCHPATH_FORMATTED="--path \"${SEARCHPATH}\"" @@ -478,6 +484,8 @@ export LINKS_PATH export LYNX_PATH export FOP_PATH +export SED_PATH +export GREP_PATH export DBLATEX_PATH export XMLTEX_PATH export PDFXMLTEX_PATH diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmlto-0.0.25/xmlto.spec new/xmlto-0.0.26/xmlto.spec --- old/xmlto-0.0.25/xmlto.spec 2011-12-01 16:58:39.000000000 +0100 +++ new/xmlto-0.0.26/xmlto.spec 2014-04-05 15:08:27.000000000 +0200 @@ -1,6 +1,6 @@ Summary: A tool for converting XML files to various formats. Name: xmlto -Version: 0.0.25 +Version: 0.0.26 Release: 0.1 License: GPLv2+ Group: Applications/System @@ -97,6 +97,11 @@ %{_datadir}/xmlto/format/xhtml1/* %changelog +* Sat Apr 04 2014 Ondrej Vasik <[email protected]> +- New version 0.0.26 +- fix build with automake 1.13+ +- fix warning in searchpath option + * Fri Dec 02 2011 Ondrej Vasik <[email protected]> - New version 0.0.25 - fix the fop.extensions setting (based on fop version) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmlto-0.0.25/xmlto.spec.in new/xmlto-0.0.26/xmlto.spec.in --- old/xmlto-0.0.25/xmlto.spec.in 2011-12-01 16:46:53.000000000 +0100 +++ new/xmlto-0.0.26/xmlto.spec.in 2014-04-05 14:55:05.000000000 +0200 @@ -97,6 +97,11 @@ %{_datadir}/xmlto/format/xhtml1/* %changelog +* Sat Apr 04 2014 Ondrej Vasik <[email protected]> +- New version 0.0.26 +- fix build with automake 1.13+ +- fix warning in searchpath option + * Fri Dec 02 2011 Ondrej Vasik <[email protected]> - New version 0.0.25 - fix the fop.extensions setting (based on fop version) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmlto-0.0.25/ylwrap new/xmlto-0.0.26/ylwrap --- old/xmlto-0.0.25/ylwrap 2010-06-23 10:35:03.000000000 +0200 +++ new/xmlto-0.0.26/ylwrap 2012-12-10 14:54:41.000000000 +0100 @@ -1,10 +1,9 @@ #! /bin/sh # ylwrap - wrapper for lex/yacc invocations. -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-08-25.18; # UTC -# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, -# 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # # Written by Tom Tromey <[email protected]>. # @@ -32,7 +31,7 @@ case "$1" in '') - echo "$0: No files given. Try \`$0 --help' for more information." 1>&2 + echo "$0: No files given. Try '$0 --help' for more information." 1>&2 exit 1 ;; --basedir) @@ -63,10 +62,25 @@ ;; esac +get_dirname () +{ + case $1 in + */*|*\\*) printf '%s\n' "$1" | sed -e 's,\([\\/]\)[^\\/]*$,\1,';; + # Otherwise, we want the empty string (not "."). + esac +} + +quote_for_sed () +{ + # FIXME: really we should care about more than '.' and '\'. + sed -e 's,[\\.],\\&,g' +} # The input. input="$1" shift +# We'll later need for a correct munging of "#line" directives. +input_sub_rx=`get_dirname "$input" | quote_for_sed` case "$input" in [\\/]* | ?:[\\/]*) # Absolute path; do nothing. @@ -99,7 +113,11 @@ # FIXME: add hostname here for parallel makes that run commands on # other machines. But that might take us over the 14-char limit. dirname=ylwrap$$ -trap "cd '`pwd`'; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15 +do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret' +trap "ret=129; $do_exit" 1 +trap "ret=130; $do_exit" 2 +trap "ret=141; $do_exit" 13 +trap "ret=143; $do_exit" 15 mkdir $dirname || exit 1 cd $dirname @@ -122,30 +140,26 @@ y_tab_nodot="yes" fi - # The directory holding the input. - input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'` - # Quote $INPUT_DIR so we can use it in a regexp. - # FIXME: really we should care about more than `.' and `\'. - input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'` + input_rx=`get_dirname "$input" | quote_for_sed` while test "$#" -ne 0; do from="$1" # Handle y_tab.c and y_tab.h output by DOS if test $y_tab_nodot = "yes"; then if test $from = "y.tab.c"; then - from="y_tab.c" + from="y_tab.c" else - if test $from = "y.tab.h"; then - from="y_tab.h" - fi + if test $from = "y.tab.h"; then + from="y_tab.h" + fi fi fi if test -f "$from"; then # If $2 is an absolute path name, then just use that, - # otherwise prepend `../'. + # otherwise prepend '../'. case "$2" in - [\\/]* | ?:[\\/]*) target="$2";; - *) target="../$2";; + [\\/]* | ?:[\\/]*) target="$2";; + *) target="../$2";; esac # We do not want to overwrite a header file if it hasn't @@ -155,18 +169,14 @@ # Makefile. Divert the output of all other files to a temporary # file so we can compare them to existing versions. if test $first = no; then - realtarget="$target" - target="tmp-`echo $target | sed s/.*[\\/]//g`" + realtarget="$target" + target="tmp-`echo $target | sed s/.*[\\/]//g`" fi - # Edit out `#line' or `#' directives. - # + # Munge "#line" or "#" directives. # We don't want the resulting debug information to point at - # an absolute srcdir; it is better for it to just mention the - # .y file with no path. - # + # an absolute srcdir. # We want to use the real output file name, not yy.lex.c for # instance. - # # We want the include guards to be adjusted too. FROM=`echo "$from" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\ @@ -175,15 +185,15 @@ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'` - sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \ + sed -e "/^#/!b" -e "s,$input_rx,$input_sub_rx," -e "s,$from,$2," \ -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$? # Check whether header files must be updated. if test $first = no; then - if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then - echo "$2" is unchanged - rm -f "$target" - else + if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then + echo "$2" is unchanged + rm -f "$target" + else echo updating "$2" mv -f "$target" "$realtarget" fi ++++++ xmlto-README.SUSE ++++++ Limitation Producing PDF Output =============================== For PDF output "xmlto" relies on "pdfxmltex" (passivetex) resp. texlive-xmltex which currently do not support the complete FO standard. If you encounter problems within this tool chain, use a FO processor such as "fop": 1/ Produce FO using "xmlto": xmlto fo file.xml 2/ Run "fop" on the .fo file: fop file.fo Specifying HTML output encoding =============================== Make use of the --xsltopts switch to specify the HTML output encoding: xmlto --xsltopts '--stringparam chunker.output.encoding "ISO-8859-1"' \ html file.xml ++++++ xmlto-xsltopts.patch ++++++ --- /var/tmp/diff_new_pack.73aFYL/_old 2014-06-16 21:43:40.000000000 +0200 +++ /var/tmp/diff_new_pack.73aFYL/_new 2014-06-16 21:43:40.000000000 +0200 @@ -1,8 +1,7 @@ -Index: xmlto.in -=================================================================== ---- xmlto.in.orig -+++ xmlto.in -@@ -38,6 +38,7 @@ OPTIONs are: +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 +@@ -39,6 +39,7 @@ -o directory put output in the specified directory instead of the current working directory -p postprocopts pass option to postprocessor @@ -10,16 +9,16 @@ --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@ +@@ -283,7 +284,7 @@ # 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: \ +- --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: \ -n xmlto -- x:m:o:p:v "$@") [ $? != 0 ] && { usage; exit 1; } eval set -- "$ARGS" -@@ -383,6 +384,10 @@ while [ "$#" -gt "0" ]; do +@@ -389,6 +390,10 @@ fi shift ;; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
