rpms/xmlto/F-10 xmlto-libpaper.patch, NONE, 1.1 xmlto-stringparam.patch, NONE, 1.1 xmlto-xmllintoptions.patch, NONE, 1.1 xmlto.spec, 1.40, 1.41

Wed Jan 28 12:22:53 UTC 2009

Author: ovasik

Update of /cvs/extras/rpms/xmlto/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4448

Modified Files:
	xmlto.spec 
Added Files:
	xmlto-libpaper.patch xmlto-stringparam.patch 
	xmlto-xmllintoptions.patch 
Log Message:
fix cleaning up of temporary files with libpaper, fix xmllint postvalid (added noent option), fix stringparam functionality, ship documentation files, spec file cleanup(merge review)

xmlto-libpaper.patch:

--- NEW FILE xmlto-libpaper.patch ---
diff -urNp xmlto-0.0.21-orig/xmlto.in xmlto-0.0.21/xmlto.in
--- xmlto-0.0.21-orig/xmlto.in	2009-01-28 12:32:29.000000000 +0100
+++ xmlto-0.0.21/xmlto.in	2009-01-28 12:35:10.000000000 +0100
@@ -1,5 +1,5 @@
 #!@BASH@
-# 
+#
 # @PACKAGE@ - apply an XSL stylesheet to an XML document
 # Copyright (C) 2001, 2002, 2003  Tim Waugh <twaugh at redhat.com>
 
@@ -106,6 +106,8 @@ then
   if [ -n "$paperheight" -a -n "$paperwidth" ]
   then
     papersizemod=$(${MKTEMP} ${TMPDIR:-/tmp}/@PACKAGE at -xsl.XXXXXX)
+    CLEANFILES[$CLEANFILE_COUNT]="$papersizemod"
+    CLEANFILE_COUNT=$(($CLEANFILE_COUNT + 1))
     cat << EOF > "$papersizemod"
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -337,8 +339,6 @@ case "$DEST_FORMAT" in
   fo | pdf | ps | dvi)
     if [ -n "$papersizemod" ]
     then
-      CLEANFILES[$CLEANFILE_COUNT]="$papersizemod"
-      CLEANFILE_COUNT=$(($CLEANFILE_COUNT + 1))
       XSL_MODS[$XSL_MOD_COUNT]="$papersizemod"
       XSL_MOD_COUNT=$(($XSL_MOD_COUNT + 1))
     fi

xmlto-stringparam.patch:

--- NEW FILE xmlto-stringparam.patch ---
diff -urNp xmlto-0.0.21-orig/THANKS xmlto-0.0.21/THANKS
--- xmlto-0.0.21-orig/THANKS	2008-02-25 15:24:59.000000000 +0100
+++ xmlto-0.0.21/THANKS	2009-01-05 17:55:58.000000000 +0100
@@ -11,3 +11,4 @@ Shlomi Fish <shlomif at gmail.com>
 Braden McDaniel <braden at endoframe.com>
 Andreas Hoenen <andreas.hoenen at arcor.de>
 Graham Wilson <graham at debian.org>
+Joseph Parmelee <jparmele at wildbear.com>
diff -urNp xmlto-0.0.21-orig/xmlto.in xmlto-0.0.21/xmlto.in
--- xmlto-0.0.21-orig/xmlto.in	2008-05-30 15:41:31.000000000 +0200
+++ xmlto-0.0.21/xmlto.in	2009-01-05 17:55:12.000000000 +0100
@@ -273,8 +273,8 @@ while [ "$#" -gt "0" ]; do
 	;;
   --stringparam)
 	MYPARAM="$2"
-	XSLTPARAMS="XSLTPARAMS --stringparam ${MYPARAM%=*}"
-	XSLTPARAMS="XSLTPARAMS $MYPARAM#*=}"
+	XSLTPARAMS="$XSLTPARAMS --stringparam ${MYPARAM%=*}"
+	XSLTPARAMS="$XSLTPARAMS ${MYPARAM#*=}"
 	shift 2
 	;;
   --noclean)

xmlto-xmllintoptions.patch:

--- NEW FILE xmlto-xmllintoptions.patch ---
diff -urNp xmlto-0.0.21-orig/xmlto.in xmlto-0.0.21/xmlto.in
--- xmlto-0.0.21-orig/xmlto.in	2009-01-28 12:51:19.000000000 +0100
+++ xmlto-0.0.21/xmlto.in	2009-01-28 12:54:35.000000000 +0100
@@ -427,8 +427,10 @@ if [ "$SKIP_VALIDATION" -eq 0 ] && [ "$S
 then
   VALIDATION="${XSLT_PROCESSED_DIR}/validation-errors"
   [ "$VERBOSE" -ge 1 ] && \
-    echo >&2 "xmllint >/dev/null --xinclude --postvalid \"$INPUT_FILE\""
-  xmllint >/dev/null --xinclude --postvalid "$INPUT_FILE" 2>"${VALIDATION}"
+  echo >&2 \
+    "xmllint >/dev/null --xinclude --postvalid --noent \"$INPUT_FILE\""
+  xmllint >/dev/null --xinclude --postvalid --noent \
+    "$INPUT_FILE" 2>"${VALIDATION}"
   xmllint_status=$?
   if [ $xmllint_status -ne 0 ]
   then


Index: xmlto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlto/F-10/xmlto.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xmlto.spec	14 Jul 2008 14:20:49 -0000	1.40
+++ xmlto.spec	28 Jan 2009 12:22:22 -0000	1.41
@@ -1,25 +1,29 @@
 Summary: A tool for converting XML files to various formats
 Name: xmlto
 Version: 0.0.21
-Release: 2%{?dist}
-License: GPLv2
+Release: 3%{?dist}
+#xmlto is released under GPLv2+ license, xmlif under GPL+ license
+License: GPLv2+ and GPL+
 Group: Applications/System
 #Older versions up to xmlto-0.0.20
 #URL: http://cyberelk.net/tim/xmlto/
 #Source0: http://cyberelk.net/tim/data/xmlto/stable/%{name}-%{version}.tar.bz2
 URL: https://fedorahosted.org/xmlto/
 Source0: http://svn.fedorahosted.org/svn/%{name}/%{name}-%{version}.tar.bz2
+Patch0: xmlto-stringparam.patch
+Patch1: xmlto-libpaper.patch
+Patch2: xmlto-xmllintoptions.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: docbook-xsl >= 1.56.0
-BuildRequires: /usr/bin/xsltproc
+BuildRequires: libxslt
 BuildRequires: util-linux, flex
 
 # We rely heavily on the DocBook XSL stylesheets!
 Requires: docbook-xsl >= 1.56.0
 Requires: text-www-browser
-Requires: /usr/bin/xsltproc
+Requires: libxslt
 Requires: docbook-dtds
 Requires: util-linux, flex
 
@@ -30,7 +34,7 @@
 %package tex
 Group: Applications/System
 License: GPLv2
-Summary: A set of xmlto backends with TeX requirements 
+Summary: A set of xmlto backends with TeX requirements
 # For full functionality, we need passivetex.
 Requires: passivetex >= 1.11
 # We require main package
@@ -42,24 +46,28 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .stringparam
+%patch1 -p1 -b .libpapercleanup
+%patch2 -p1 -b .xmllintoptions
 
 %build
 touch doc/xmlto.xml doc/xmlif.xml
 %configure
-make
+make %{?_smp_mflags}
 
 %check
 make check
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%doc COPYING ChangeLog README AUTHORS NEWS
 %{_bindir}/*
 %{_mandir}/*/*
 %{_datadir}/xmlto
@@ -68,14 +76,21 @@
 %exclude %{_datadir}/xmlto/format/fo/pdf
 
 %files tex
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_datadir}/xmlto/format/fo/dvi
 %{_datadir}/xmlto/format/fo/ps
 %{_datadir}/xmlto/format/fo/pdf
 
 %changelog
+* Wed Jan 28 2009 Ondrej Vasik <ovasik at redhat.com> - 0.0.21-3
+- fix cleaning up of temporary files with libpaper(Debian)
+- fix xmllint postvalid (added noent option)
+- fix stringparam option functionality
+- correct doc filelist attributes, fix license, ship
+  documentation files, spec file cleanup
+
 * Fri Jul 11 2008 Ondrej Vasik <ovasik at redhat.com> - 0.0.21-2
-- xmlto-tex subpackage to prevent requirements for 
+- xmlto-tex subpackage to prevent requirements for
   passivetex/tex for all backends(#454341)
 
 * Mon Jun 20 2008 Ondrej Vasik <ovasik at redhat.com> - 0.0.21-1


