From abf08848807ad4d01858cda0ae0f4adbe52602a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= Date: Thu, 15 Sep 2011 11:09:09 +0200 Subject: [PATCH 1/3] Requested by #681909 - new release 0.0.24, basic support for docbook->epub, conversion, use backend extensions by default --- .gitignore | 1 + sources | 2 +- xmlto-0.0.23-Lchapterpassivetex.patch | 45 --------------------------- xmlto.spec | 13 +++++--- 4 files changed, 10 insertions(+), 51 deletions(-) delete mode 100644 xmlto-0.0.23-Lchapterpassivetex.patch diff --git a/.gitignore b/.gitignore index 8603267..f7ef76a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xmlto-0.0.23.tar.bz2 +/xmlto-0.0.24.tar.bz2 diff --git a/sources b/sources index cb16b93..6e396e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3001d6bb2bbc2c8f6c2301f05120f074 xmlto-0.0.23.tar.bz2 +9d45bbe43f7c66c6bf585ba6635df31a xmlto-0.0.24.tar.bz2 diff --git a/xmlto-0.0.23-Lchapterpassivetex.patch b/xmlto-0.0.23-Lchapterpassivetex.patch deleted file mode 100644 index 3c1d2b0..0000000 --- a/xmlto-0.0.23-Lchapterpassivetex.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -urNp xmlto-0.0.23-orig/format/fo/dvi xmlto-0.0.23/format/fo/dvi ---- xmlto-0.0.23-orig/format/fo/dvi 2009-09-18 12:06:23.000000000 +0200 -+++ xmlto-0.0.23/format/fo/dvi 2009-10-13 14:08:46.000000000 +0200 -@@ -13,7 +13,10 @@ post-process) - fi - # Work around stupid tetex bug with '_' in filenames - # Also work around stupid tetex limitation with long lines (bug #101055) -- sed -e "s,/>,\n/>,g" "$XSLT_PROCESSED" >tmp.fo -+ # and workaround passivetex limitation for chapter titles starting with L -+ # (#526273) -+ sed -e "s,/>,/>\n,g" \ -+ -e "s,block>,&\n,g" "$XSLT_PROCESSED" >tmp.fo - OUT=output - TEXINPUTS="$(dirname "$INPUT_FILE")::$SEARCHPATH" - export TEXINPUTS -diff -urNp xmlto-0.0.23-orig/format/fo/pdf xmlto-0.0.23/format/fo/pdf ---- xmlto-0.0.23-orig/format/fo/pdf 2009-09-18 12:06:23.000000000 +0200 -+++ xmlto-0.0.23/format/fo/pdf 2009-10-13 14:09:08.000000000 +0200 -@@ -15,7 +15,10 @@ DEFAULT|DBLATEX) - fi - # Work around stupid tetex bug with '_' in filenames - # Also work around stupid tetex limitation with long lines (bug #101055) -- sed -e "s,/>,\n/>,g" "$XSLT_PROCESSED" >tmp.fo -+ # and workaround passivetex limitation for chapter titles starting with L -+ # (#526273) -+ sed -e "s,/>,/>\n,g" \ -+ -e "s,block>,&\n,g" "$XSLT_PROCESSED" >tmp.fo - OUT=output - TEXINPUTS="$(dirname "$INPUT_FILE")::$SEARCHPATH" - export TEXINPUTS -diff -urNp xmlto-0.0.23-orig/format/fo/ps xmlto-0.0.23/format/fo/ps ---- xmlto-0.0.23-orig/format/fo/ps 2009-03-17 17:39:52.000000000 +0100 -+++ xmlto-0.0.23/format/fo/ps 2009-10-13 14:01:39.000000000 +0200 -@@ -10,7 +10,10 @@ DEFAULT|DBLATEX) - fi - # Work around stupid tetex bug with '_' in filenames - # Also work around stupid tetex limitation with long lines (bug #101055) -- sed -e "s,/>,\n/>,g" "$XSLT_PROCESSED" >tmp.fo -+ # and workaround passivetex limitation for chapter titles starting with L -+ # (#526273) -+ sed -e "s,/>,/>\n,g" \ -+ -e "s,block>,&\n,g" "$XSLT_PROCESSED" >tmp.fo - OUT=output - TEXINPUTS="$(dirname "$INPUT_FILE")::$SEARCHPATH" - export TEXINPUTS diff --git a/xmlto.spec b/xmlto.spec index 85c7833..e2f5b6c 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -1,7 +1,7 @@ Summary: A tool for converting XML files to various formats Name: xmlto -Version: 0.0.23 -Release: 4%{?dist} +Version: 0.0.24 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -17,12 +17,11 @@ BuildRequires: libxslt BuildRequires: util-linux, flex # We rely heavily on the DocBook XSL stylesheets! -Requires: docbook-xsl >= 1.56.0 +Requires: docbook-xsl >= 1.74.2 Requires: text-www-browser Requires: libxslt Requires: docbook-dtds Requires: util-linux, flex -Patch1: xmlto-0.0.23-Lchapterpassivetex.patch %description This is a package for converting XML files to various formats using XSL @@ -59,7 +58,6 @@ xhtml1 source format. %prep %setup -q -%patch1 -p1 %build %configure BASH=/bin/bash @@ -101,6 +99,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 14 2011 Ondrej Vasik - 0.0.24-1 +- new release 0.0.24, basic support for docbook->epub + conversion, use backend extensions by default + (--noextensions) to disable it + * Mon Feb 07 2011 Fedora Release Engineering - 0.0.23-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 55f6cb082a6f493d7fafda2b0bdd274094eb68ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= Date: Tue, 29 Nov 2011 12:59:57 +0100 Subject: [PATCH 2/3] fix the functionality of fop.extensions (#757035) --- xmlto-fopextensions.patch | 49 +++++++++++++++++++++++++++++++++++++++ xmlto.spec | 8 ++++++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 xmlto-fopextensions.patch diff --git a/xmlto-fopextensions.patch b/xmlto-fopextensions.patch new file mode 100644 index 0000000..b16ef3a --- /dev/null +++ b/xmlto-fopextensions.patch @@ -0,0 +1,49 @@ +diff -urNp xmlto-0.0.24-orig/configure.in xmlto-0.0.24/configure.in +--- xmlto-0.0.24-orig/configure.in 2011-07-14 12:50:47.000000000 +0200 ++++ xmlto-0.0.24/configure.in 2011-11-29 12:53:50.614481739 +0100 +@@ -109,6 +109,9 @@ AC_PATH_PROG([W3M], [w3m], [w3m]) + AC_ARG_VAR([TAIL], [Name and path of a tail binary that supports -n.]) + AC_PATH_PROG([TAIL], [tail], [tail]) + ++AC_ARG_VAR([GREP], [Name and path of a GNU grep binary.]) ++AC_PATH_PROG([GREP], [grep], [grep]) ++ + AC_ARG_VAR([GCP], [Name and path of a GNU cp binary (need at least -P)]) + AC_PATH_PROG([GCP], [cp], [cp]) + +Binary files xmlto-0.0.24-orig/.configure.in.swp and xmlto-0.0.24/.configure.in.swp differ +diff -urNp xmlto-0.0.24-orig/xmlto.in xmlto-0.0.24/xmlto.in +--- xmlto-0.0.24-orig/xmlto.in 2011-07-14 12:41:25.000000000 +0200 ++++ xmlto-0.0.24/xmlto.in 2011-11-29 12:53:02.105195055 +0100 +@@ -22,6 +22,7 @@ MKTEMP=@MKTEMP@ # See http://www.mktemp. + BASH=@BASH@ # GNU bash, for running the format scripts + GETOPT=@GETOPT@ # a getopt that supports --longoptions + TAIL=@TAIL@ # a tail that supports -n (posix) ++GREP=@GREP@ # GNU grep, for searching patterns + + version () { + echo "@PACKAGE@ version @VERSION@" +@@ -236,6 +237,14 @@ then + echo >&2 "@PACKAGE@: Warning: fop not found or not executable." + echo >&2 "@PACKAGE@: Using default backend..." + USE_BACKEND=DEFAULT ++else ++ # we should enable fop.extensions for fop 0_17,0_18 and 0_20*, ++ # fop1.extensions for the rest ++ if [ x`$FOP_PATH -v 2>/dev/null | $GREP 0_[12]` = x ]; then ++ FOPVERSION="fop1" ++ else ++ FOPVERSION="fop" ++ fi + fi + if [ x"$USE_BACKEND" = xDBLATEX ] && \ + [ -z "`type -t $DBLATEX_PATH`" ] +@@ -385,7 +394,7 @@ if [ "$BACKEND_EXTENSIONS" -eq 1 ] + then + case "$USE_BACKEND" in + FOP) +- XSLTOPTS="$XSLTOPTS --param fop.extensions '1' --param fop1.extensions '1'" ;; ++ XSLTOPTS="$XSLTOPTS --param $FOPVERSION.extensions '1'" ;; + DBLATEX) + ;; + DEFAULT) diff --git a/xmlto.spec b/xmlto.spec index e2f5b6c..ea7b661 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -1,7 +1,7 @@ Summary: A tool for converting XML files to various formats Name: xmlto Version: 0.0.24 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -9,6 +9,7 @@ Group: Applications/System #Source0: http://cyberelk.net/tim/data/xmlto/stable/%{name}-%{version}.tar.bz2 URL: https://fedorahosted.org/xmlto/ Source0: https://fedorahosted.org/releases/x/m/%{name}/%{name}-%{version}.tar.bz2 +Patch1: xmlto-fopextensions.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -58,8 +59,10 @@ xhtml1 source format. %prep %setup -q +%patch1 -p1 -b .extensions %build +autoreconf %configure BASH=/bin/bash make %{?_smp_mflags} @@ -99,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Nov 29 2011 Ondrej Vasik - 9.0.24-2 +- fix the functionality of fop.extensions (#757035) + * Thu Jul 14 2011 Ondrej Vasik - 0.0.24-1 - new release 0.0.24, basic support for docbook->epub conversion, use backend extensions by default From fdc824bde2a3e02a27b5ae641f9bf9ed84cab472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= Date: Tue, 29 Nov 2011 13:00:29 +0100 Subject: [PATCH 3/3] fix typo in changelog --- xmlto.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index ea7b661..7171a36 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -102,7 +102,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Tue Nov 29 2011 Ondrej Vasik - 9.0.24-2 +* Tue Nov 29 2011 Ondrej Vasik - 0.0.24-2 - fix the functionality of fop.extensions (#757035) * Thu Jul 14 2011 Ondrej Vasik - 0.0.24-1