new release 0.0.25, fix handling of external data objects with fop

This commit is contained in:
Ondřej Vašík 2011-12-02 09:37:20 +01:00
parent 297e1d4731
commit f476f83cdf
4 changed files with 8 additions and 57 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
xmlto-0.0.23.tar.bz2 xmlto-0.0.23.tar.bz2
/xmlto-0.0.24.tar.bz2 /xmlto-0.0.24.tar.bz2
/xmlto-0.0.25.tar.bz2

View File

@ -1 +1 @@
9d45bbe43f7c66c6bf585ba6635df31a xmlto-0.0.24.tar.bz2 6b6267b1470f8571fe5f63a128970364 xmlto-0.0.25.tar.bz2

View File

@ -1,49 +0,0 @@
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)

View File

@ -1,7 +1,7 @@
Summary: A tool for converting XML files to various formats Summary: A tool for converting XML files to various formats
Name: xmlto Name: xmlto
Version: 0.0.24 Version: 0.0.25
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
#Older versions up to xmlto-0.0.20 #Older versions up to xmlto-0.0.20
@ -9,15 +9,12 @@ Group: Applications/System
#Source0: http://cyberelk.net/tim/data/xmlto/stable/%{name}-%{version}.tar.bz2 #Source0: http://cyberelk.net/tim/data/xmlto/stable/%{name}-%{version}.tar.bz2
URL: https://fedorahosted.org/xmlto/ URL: https://fedorahosted.org/xmlto/
Source0: https://fedorahosted.org/releases/x/m/%{name}/%{name}-%{version}.tar.bz2 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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: docbook-xsl >= 1.56.0 BuildRequires: docbook-xsl >= 1.56.0
BuildRequires: libxslt BuildRequires: libxslt
BuildRequires: util-linux, flex BuildRequires: util-linux, flex
#disable it when removing the patch
BuildRequires: autoconf automake
# We rely heavily on the DocBook XSL stylesheets! # We rely heavily on the DocBook XSL stylesheets!
Requires: docbook-xsl >= 1.74.2 Requires: docbook-xsl >= 1.74.2
@ -61,10 +58,8 @@ xhtml1 source format.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .extensions
%build %build
autoreconf
%configure BASH=/bin/bash %configure BASH=/bin/bash
make %{?_smp_mflags} make %{?_smp_mflags}
@ -104,6 +99,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Fri Dec 02 2011 Ondrej Vasik <ovasik@redhat.com> - 0.0.25-1
- fix handling of external data objects with fop
(deb #568894)
* Tue Nov 29 2011 Ondrej Vasik <ovasik@redhat.com> - 0.0.24-2 * Tue Nov 29 2011 Ondrej Vasik <ovasik@redhat.com> - 0.0.24-2
- fix the functionality of fop.extensions (#757035) - fix the functionality of fop.extensions (#757035)