rpms/xmlto/F-9 xmlto-stringparam.patch, NONE, 1.1 xmlto-xmllintoptions.patch, NONE, 1.1 xmlto.spec, 1.37, 1.38

[Ondrej Vasik]

Author: ovasik

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

Modified Files:
	xmlto.spec 
Added Files:
	xmlto-stringparam.patch xmlto-xmllintoptions.patch 
Log Message:
fix xmllint postvalid (added noent option), fix stringparam option functionality, ship documentation files, spec file cleanup

xmlto-stringparam.patch:

--- NEW FILE xmlto-stringparam.patch ---
diff -urNp xmlto-0.0.20-orig/THANKS xmlto-0.0.20/THANKS
--- xmlto-0.0.20-orig/THANKS	2008-01-15 13:56:45.000000000 +0100
+++ xmlto-0.0.20/THANKS	2009-02-02 13:03:10.000000000 +0100
@@ -9,3 +9,4 @@ Tommy Reynolds <tommy.reynolds at megacoder
 Coleman Kane <cokane at cokane.org>
 Shlomi Fish <shlomif at gmail.com>
 Braden McDaniel <braden at endoframe.com>
+Joseph Parmelee <jparmele at wildbear.com>
diff -urNp xmlto-0.0.20-orig/xmlto.in xmlto-0.0.20/xmlto.in
--- xmlto-0.0.20-orig/xmlto.in	2009-02-02 13:00:17.000000000 +0100
+++ xmlto-0.0.20/xmlto.in	2009-02-02 13:02:41.000000000 +0100
@@ -241,8 +241,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)
Binární soubory xmlto-0.0.20-orig/.xmlto.in.swp a xmlto-0.0.20/.xmlto.in.swp jsou různé

xmlto-xmllintoptions.patch:

--- NEW FILE xmlto-xmllintoptions.patch ---
diff -urNp xmlto-0.0.20-orig/xmlto.in xmlto-0.0.20/xmlto.in
--- xmlto-0.0.20-orig/xmlto.in	2009-02-02 13:23:06.000000000 +0100
+++ xmlto-0.0.20/xmlto.in	2009-02-02 13:27:50.000000000 +0100
@@ -372,8 +372,9 @@ 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-9/xmlto.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xmlto.spec	13 May 2008 10:16:58 -0000	1.37
+++ xmlto.spec	2 Feb 2009 12:32:22 -0000	1.38
@@ -1,15 +1,19 @@
 %{!?tetex:%define tetex 1}
 
-Summary: A tool for converting XML files to various formats.
+Summary: A tool for converting XML files to various formats
 Name: xmlto
 Version: 0.0.20
-Release: 3%{?dist}
-License: GPLv2
+Release: 4%{?dist}
+#xmlto is released under GPLv2+ license, xmlif under GPL+ license
+License: GPLv2+ and GPL+
 Group: Applications/System
+#Newer versions above xmlto-0.0.20 at https://fedorahosted.org/xmlto/
 URL: http://cyberelk.net/tim/xmlto/
 Source0: http://cyberelk.net/tim/data/xmlto/stable/%{name}-%{version}.tar.bz2
 
 Patch1: xmlto-backendstylesheet.patch
+Patch2: xmlto-stringparam.patch
+Patch3: xmlto-xmllintoptions.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -37,27 +41,37 @@
 %prep
 %setup -q
 %patch1 -p1 -b .backendstylesheet
+%patch2 -p1 -b .stringparam
+%patch3 -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
 
 %changelog
+* Mon Feb 02 2009 Ondrej Vasik <ovasik at redhat.com> - 0.0.20-4
+- fix xmllint postvalid (added noent option)
+- fix stringparam option functionality
+- ship documentation files, spec file cleanup
+
 * Tue May 13 2008 Ondrej Vasik <ovasik at redhat.com> - 0.0.20-3
 - fixed errorneus handling of backend stylesheet(#446092)
 - removed unused patches
@@ -70,7 +84,7 @@
 - added experimental fop support(additional output formats)
 - possibility to read stylesheet from STDIN, using recursive
   cp in docbook formats, updated man pages
-  
+
 * Wed Nov 28 2007 Ondrej Vasik <ovasik at redhat.com> - 0.0.19-1
 - new version 0.0.19
 - added dist tag