rpms/xmlto
5
0
Fork 0
Code Issues Pull Requests Releases Activity

fixed errorneus handling of backend stylesheet(#446092)

Browse Source
This commit is contained in:
Ondrej Vasik 2008-05-13 10:25:57 +00:00
parent 8d56737189
commit f0775fec13
3 changed files with 9 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
xmlto-basename.patch
View File

@ -1,71 +0,0 @@
--- xmlto-0.0.18/format/docbook/fo.basename 2005-08-08 14:00:24.000000000 +0100
+++ xmlto-0.0.18/format/docbook/fo 2005-08-08 14:01:13.000000000 +0100
@@ -7,6 +7,6 @@
echo "http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"
;;
post-process)
- cp "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).fo"
+ cp "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo"
;;
esac
--- xmlto-0.0.18/format/docbook/html-nochunks.basename 2005-08-08 14:01:39.000000000 +0100
+++ xmlto-0.0.18/format/docbook/html-nochunks 2005-08-08 14:01:49.000000000 +0100
@@ -7,6 +7,6 @@
echo "http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"
;;
post-process)
- cp "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).html"
+ cp "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").html"
;;
esac
--- xmlto-0.0.18/format/docbook/txt.basename 2005-08-08 14:02:16.000000000 +0100
+++ xmlto-0.0.18/format/docbook/txt 2005-08-08 14:02:26.000000000 +0100
@@ -29,6 +29,6 @@
echo >&2 "Convert HTML to ASCII"
fi
${CONVERT} ${ARGS} ${POSTARGS} ${XSLT_PROCESSED} > \
- "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).txt"
+ "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").txt"
;;
esac
--- xmlto-0.0.18/format/fo/dvi.basename 2005-08-08 14:02:39.000000000 +0100
+++ xmlto-0.0.18/format/fo/dvi 2005-08-08 14:02:48.000000000 +0100
@@ -29,6 +29,6 @@
[ "$VERBOSE" -ge 3 ] && cat $OUT
fi
fi
- cp -- *.dvi "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).dvi"
+ cp -- *.dvi "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").dvi"
;;
esac
--- xmlto-0.0.18/format/fo/pdf.basename 2005-08-08 14:03:01.000000000 +0100
+++ xmlto-0.0.18/format/fo/pdf 2005-08-08 14:03:08.000000000 +0100
@@ -29,6 +29,6 @@
[ "$VERBOSE" -ge 3 ] && cat $OUT
fi
fi
- cp -- *.pdf "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).pdf"
+ cp -- *.pdf "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").pdf"
;;
esac
--- xmlto-0.0.18/format/fo/ps.basename 2005-08-08 14:03:14.000000000 +0100
+++ xmlto-0.0.18/format/fo/ps 2005-08-08 14:03:23.000000000 +0100
@@ -33,6 +33,6 @@
then
echo >&2 "Post-process DVI to PS"
fi
- dvips -R -q ${POSTPOSTARGS} -o "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).ps" *.dvi
+ dvips -R -q ${POSTPOSTARGS} -o "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").ps" *.dvi
;;
esac
--- xmlto-0.0.18/xmlto.in.basename 2005-08-08 14:03:38.000000000 +0100
+++ xmlto-0.0.18/xmlto.in 2005-08-08 14:03:52.000000000 +0100
@@ -339,7 +339,7 @@
XSLT_PROCESSED="$INPUT_FILE"
else
[ "$VERBOSE" -ge 1 ] && echo >&2 "Stylesheet: ${STYLESHEET}"
- XSLT_PROCESSED="$XSLT_PROCESSED_DIR/$(basename ${INPUT_FILE%.*}).proc"
+ XSLT_PROCESSED="$XSLT_PROCESSED_DIR/$(basename "${INPUT_FILE%.*}").proc"
if [ "$VERBOSE" -gt 2 ]
then

12
xmlto-findwarning.patch
View File

@ -1,12 +0,0 @@
diff -urNp xmlto-0.0.18.orig/xmlto.in xmlto-0.0.18/xmlto.in
--- xmlto-0.0.18.orig/xmlto.in 2004-01-02 13:03:24.000000000 +0100
+++ xmlto-0.0.18/xmlto.in 2007-10-08 13:48:22.000000000 +0200
@@ -47,7 +47,7 @@ determined automatically).
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

10
xmlto.spec
View File

@ -3,11 +3,14 @@
Summary: A tool for converting XML files to various formats.
Name: xmlto
Version: 0.0.20
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2
Group: Applications/System
URL: http://cyberelk.net/tim/xmlto/
Source0: http://cyberelk.net/tim/data/xmlto/stable/%{name}-%{version}.tar.bz2
Patch1: xmlto-backendstylesheet.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: docbook-xsl >= 1.56.0
@ -33,6 +36,7 @@ stylesheets.
%prep
%setup -q
%patch1 -p1 -b .backendstylesheet
%build
touch doc/xmlto.xml doc/xmlif.xml
@ -54,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/xmlto
%changelog
* Tue May 13 2008 Ondrej Vasik <ovasik@redhat.com> - 0.0.20-3
- fixed errorneus handling of backend stylesheet(#446092)
- removed unused patches
* Mon Feb 11 2008 Ondrej Vasik <ovasik@redhat.com> - 0.0.20-2
- gcc4.3 rebuild