From 60c6e1b4b5c8d2b9a39dba7ff1921b3744f21379 Mon Sep 17 00:00:00 2001 From: Ondrej Vasik Date: Fri, 12 Dec 2008 11:02:59 +0000 Subject: [PATCH 01/69] merge review(#226568): ship documentation files, fix license tag, use recommended parrallel make, make install instead of makeinstall macro, require libxslt instead of direct binary requirement, do not unnecessarily touch .xml files in doc subdir --- xmlto.spec | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/xmlto.spec b/xmlto.spec index 0c5b461..28e84cd 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -1,8 +1,8 @@ Summary: A tool for converting XML files to various formats Name: xmlto Version: 0.0.21 -Release: 2%{?dist} -License: GPLv2 +Release: 3%{?dist} +License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 #URL: http://cyberelk.net/tim/xmlto/ @@ -13,13 +13,13 @@ Source0: http://svn.fedorahosted.org/svn/%{name}/%{name}-%{version}.tar.bz2 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 +30,7 @@ stylesheets. %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 @@ -44,21 +44,21 @@ PassiveTeX/TeX for functionality. %setup -q %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 +%doc COPYING ChangeLog README AUTHORS NEWS %defattr(-,root,root) %{_bindir}/* %{_mandir}/*/* @@ -74,8 +74,14 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xmlto/format/fo/pdf %changelog +* Fri Dec 12 2008 Ondrej Vasik - 0.0.21-3 +- merge review(#226568): + ship documentation files, fix license tag, use recommended + parallel make, make install instead of macro, require libxslt + instead of direct binary requirement + * Fri Jul 11 2008 Ondrej Vasik - 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 - 0.0.21-1 @@ -93,7 +99,7 @@ rm -rf $RPM_BUILD_ROOT - 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 - 0.0.19-1 - new version 0.0.19 - added dist tag From a735a644873b40e9b07e304e45eff882c1b96414 Mon Sep 17 00:00:00 2001 From: Ondrej Vasik Date: Tue, 16 Dec 2008 16:36:52 +0000 Subject: [PATCH 02/69] Merge review #226568: correct doc filelist attributes, add License GPL+ for xmlif --- xmlto.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/xmlto.spec b/xmlto.spec index 28e84cd..502dd59 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -1,14 +1,14 @@ Summary: A tool for converting XML files to various formats Name: xmlto Version: 0.0.21 -Release: 3%{?dist} -License: GPLv2+ +Release: 4%{?dist} +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 +Source0: https://fedorahosted.org/releases/x/m/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,7 +29,7 @@ stylesheets. %package tex Group: Applications/System -License: GPLv2 +License: GPLv2+ Summary: A set of xmlto backends with TeX requirements # For full functionality, we need passivetex. Requires: passivetex >= 1.11 @@ -58,8 +58,8 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT %files -%doc COPYING ChangeLog README AUTHORS NEWS %defattr(-,root,root) +%doc COPYING ChangeLog README AUTHORS NEWS %{_bindir}/* %{_mandir}/*/* %{_datadir}/xmlto @@ -74,6 +74,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xmlto/format/fo/pdf %changelog +* Tue Dec 16 2008 Ondrej Vasik - 0.0.21-4 +- merge review(#226568) + correct doc filelist attributes, add License GPL+ for xmlif + * Fri Dec 12 2008 Ondrej Vasik - 0.0.21-3 - merge review(#226568): ship documentation files, fix license tag, use recommended From 3075a2307b54fcc619ac2fad42448ddfc48389a9 Mon Sep 17 00:00:00 2001 From: Ondrej Vasik Date: Mon, 5 Jan 2009 17:01:32 +0000 Subject: [PATCH 03/69] fix stringparam option functionality, clarify licenses --- xmlto-stringparam.patch | 22 ++++++++++++++++++++++ xmlto.spec | 8 +++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 xmlto-stringparam.patch diff --git a/xmlto-stringparam.patch b/xmlto-stringparam.patch new file mode 100644 index 0000000..3c87942 --- /dev/null +++ b/xmlto-stringparam.patch @@ -0,0 +1,22 @@ +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 + Braden McDaniel + Andreas Hoenen + Graham Wilson ++Joseph Parmelee +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) diff --git a/xmlto.spec b/xmlto.spec index 502dd59..ba106c2 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -1,7 +1,8 @@ Summary: A tool for converting XML files to various formats Name: xmlto Version: 0.0.21 -Release: 4%{?dist} +Release: 5%{?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 @@ -9,6 +10,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 +Patch0: xmlto-stringparam.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -42,6 +44,7 @@ PassiveTeX/TeX for functionality. %prep %setup -q +%patch0 -p1 -b .stringparam %build %configure @@ -74,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xmlto/format/fo/pdf %changelog +* Mon Jan 05 2009 Ondrej Vasik - 0.0.21-5 +- fix stringparam option functionality + * Tue Dec 16 2008 Ondrej Vasik - 0.0.21-4 - merge review(#226568) correct doc filelist attributes, add License GPL+ for xmlif From fd7c5ff93c3ddcff8c063a334a1cf85a43b7d09e Mon Sep 17 00:00:00 2001 From: Ondrej Vasik Date: Wed, 28 Jan 2009 12:01:32 +0000 Subject: [PATCH 04/69] fix cleaning up of temporary files with libpaper(Debian), fix xmllint postvalid (added noent option), use nonet switch --- xmlto-libpaper.patch | 28 ++++++++++++++++++++++++++++ xmlto-xmllintoptions.patch | 16 ++++++++++++++++ xmlto.spec | 11 ++++++++++- 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 xmlto-libpaper.patch create mode 100644 xmlto-xmllintoptions.patch diff --git a/xmlto-libpaper.patch b/xmlto-libpaper.patch new file mode 100644 index 0000000..51c3c56 --- /dev/null +++ b/xmlto-libpaper.patch @@ -0,0 +1,28 @@ +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 + +@@ -106,6 +106,8 @@ then + if [ -n "$paperheight" -a -n "$paperwidth" ] + then + papersizemod=$(${MKTEMP} ${TMPDIR:-/tmp}/@PACKAGE@-xsl.XXXXXX) ++ CLEANFILES[$CLEANFILE_COUNT]="$papersizemod" ++ CLEANFILE_COUNT=$(($CLEANFILE_COUNT + 1)) + cat << EOF > "$papersizemod" + + &2 "xmllint >/dev/null --xinclude --postvalid \"$INPUT_FILE\"" +- xmllint >/dev/null --xinclude --postvalid "$INPUT_FILE" 2>"${VALIDATION}" ++ echo >&2 \ ++ "xmllint >/dev/null --nonet --xinclude --postvalid --noent \"$INPUT_FILE\"" ++ xmllint >/dev/null --nonet --xinclude --postvalid --noent \ ++ "$INPUT_FILE" 2>"${VALIDATION}" + xmllint_status=$? + if [ $xmllint_status -ne 0 ] + then diff --git a/xmlto.spec b/xmlto.spec index ba106c2..a6d6f72 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.21 -Release: 5%{?dist} +Release: 6%{?dist} #xmlto is released under GPLv2+ license, xmlif under GPL+ license License: GPLv2+ and GPL+ Group: Applications/System @@ -11,6 +11,8 @@ Group: Applications/System URL: https://fedorahosted.org/xmlto/ Source0: https://fedorahosted.org/releases/x/m/%{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) @@ -45,6 +47,8 @@ PassiveTeX/TeX for functionality. %prep %setup -q %patch0 -p1 -b .stringparam +%patch1 -p1 -b .libpapercleanup +%patch2 -p1 -b .xmllintoptions %build %configure @@ -77,6 +81,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xmlto/format/fo/pdf %changelog +* Wed Jan 28 2009 Ondrej Vasik - 0.0.21-6 +- fix cleaning up of temporary files with libpaper(Debian) +- fix xmllint postvalid (added noent option), use nonet + switch + * Mon Jan 05 2009 Ondrej Vasik - 0.0.21-5 - fix stringparam option functionality From ace75522a1528681073373b8fe25149fdfefce38 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 10:08:11 +0000 Subject: [PATCH 05/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index a6d6f72..1a2786a 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.21 -Release: 6%{?dist} +Release: 7%{?dist} #xmlto is released under GPLv2+ license, xmlif under GPL+ license License: GPLv2+ and GPL+ Group: Applications/System @@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xmlto/format/fo/pdf %changelog +* Thu Feb 26 2009 Fedora Release Engineering - 0.0.21-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Jan 28 2009 Ondrej Vasik - 0.0.21-6 - fix cleaning up of temporary files with libpaper(Debian) - fix xmllint postvalid (added noent option), use nonet From f1b85f793253973050f154b135a3083a9b53a99e Mon Sep 17 00:00:00 2001 From: Ondrej Vasik Date: Mon, 2 Mar 2009 17:16:19 +0000 Subject: [PATCH 06/69] temporarily disable noent switch - blocks lcdproc doc build(#488093) --- xmlto-xmllintoptions.patch | 4 ++-- xmlto.spec | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/xmlto-xmllintoptions.patch b/xmlto-xmllintoptions.patch index 3ee950b..a874a9a 100644 --- a/xmlto-xmllintoptions.patch +++ b/xmlto-xmllintoptions.patch @@ -8,8 +8,8 @@ diff -urNp xmlto-0.0.21-orig/xmlto.in xmlto-0.0.21/xmlto.in - echo >&2 "xmllint >/dev/null --xinclude --postvalid \"$INPUT_FILE\"" - xmllint >/dev/null --xinclude --postvalid "$INPUT_FILE" 2>"${VALIDATION}" + echo >&2 \ -+ "xmllint >/dev/null --nonet --xinclude --postvalid --noent \"$INPUT_FILE\"" -+ xmllint >/dev/null --nonet --xinclude --postvalid --noent \ ++ "xmllint >/dev/null --nonet --xinclude --postvalid \"$INPUT_FILE\"" ++ xmllint >/dev/null --nonet --xinclude --postvalid \ + "$INPUT_FILE" 2>"${VALIDATION}" xmllint_status=$? if [ $xmllint_status -ne 0 ] diff --git a/xmlto.spec b/xmlto.spec index 1a2786a..2bea4f6 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.21 -Release: 7%{?dist} +Release: 8%{?dist} #xmlto is released under GPLv2+ license, xmlif under GPL+ license License: GPLv2+ and GPL+ Group: Applications/System @@ -65,7 +65,7 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc COPYING ChangeLog README AUTHORS NEWS %{_bindir}/* %{_mandir}/*/* @@ -75,12 +75,16 @@ rm -rf $RPM_BUILD_ROOT %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 +* Mon Mar 02 2009 Ondrej Vasik - 0.0.21-7 +- temporarily disable noent switch - blocks lcdproc doc build + (#488093) + * Thu Feb 26 2009 Fedora Release Engineering - 0.0.21-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 0c27b2a0ca920391b5dd495a8b76c4e69932fa90 Mon Sep 17 00:00:00 2001 From: Ondrej Vasik Date: Mon, 16 Mar 2009 13:59:14 +0000 Subject: [PATCH 07/69] reenable noent switch - bug is on lcdproc doc side, add xhtml support (as subpackage) (#145140) --- xmlto-xhtml1.patch | 172 +++++++++++++++++++++++++++++++++++++ xmlto-xmllintoptions.patch | 4 +- xmlto.spec | 32 ++++++- 3 files changed, 204 insertions(+), 4 deletions(-) create mode 100644 xmlto-xhtml1.patch diff --git a/xmlto-xhtml1.patch b/xmlto-xhtml1.patch new file mode 100644 index 0000000..2c54241 --- /dev/null +++ b/xmlto-xhtml1.patch @@ -0,0 +1,172 @@ +diff -urNp xmlto-0.0.21-orig/format/xhtml1/dvi xmlto-0.0.21/format/xhtml1/dvi +--- xmlto-0.0.21-orig/format/xhtml1/dvi 1970-01-01 01:00:00.000000000 +0100 ++++ xmlto-0.0.21/format/xhtml1/dvi 2009-03-16 12:30:34.000000000 +0100 +@@ -0,0 +1,13 @@ ++case "$1" in ++stylesheet) ++ if [ "$VERBOSE" -ge 1 ] ++ then ++ echo >&2 "Convert to XSL-FO" ++ fi ++ echo "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" ++ ;; ++post-process) ++ # Get the FO format script to do the rest ++ sh "$(dirname "$0")/../fo/$(basename "$0")" "$1" ++ ;; ++esac +diff -urNp xmlto-0.0.21-orig/format/xhtml1/fo xmlto-0.0.21/format/xhtml1/fo +--- xmlto-0.0.21-orig/format/xhtml1/fo 1970-01-01 01:00:00.000000000 +0100 ++++ xmlto-0.0.21/format/xhtml1/fo 2009-03-16 12:30:34.000000000 +0100 +@@ -0,0 +1,12 @@ ++case "$1" in ++stylesheet) ++ if [ "$VERBOSE" -ge 1 ] ++ then ++ echo >&2 "Convert to XSL-FO" ++ fi ++ echo "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" ++ ;; ++post-process) ++ cp "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).fo" ++ ;; ++esac +diff -urNp xmlto-0.0.21-orig/format/xhtml1/pdf xmlto-0.0.21/format/xhtml1/pdf +--- xmlto-0.0.21-orig/format/xhtml1/pdf 1970-01-01 01:00:00.000000000 +0100 ++++ xmlto-0.0.21/format/xhtml1/pdf 2009-03-16 12:30:34.000000000 +0100 +@@ -0,0 +1,13 @@ ++case "$1" in ++stylesheet) ++ if [ "$VERBOSE" -ge 1 ] ++ then ++ echo >&2 "Convert to XSL-FO" ++ fi ++ echo "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" ++ ;; ++post-process) ++ # Get the FO format script to do the rest ++ sh "$(dirname "$0")/../fo/$(basename "$0")" "$1" ++ ;; ++esac +diff -urNp xmlto-0.0.21-orig/format/xhtml1/ps xmlto-0.0.21/format/xhtml1/ps +--- xmlto-0.0.21-orig/format/xhtml1/ps 1970-01-01 01:00:00.000000000 +0100 ++++ xmlto-0.0.21/format/xhtml1/ps 2009-03-16 12:30:34.000000000 +0100 +@@ -0,0 +1,13 @@ ++case "$1" in ++stylesheet) ++ if [ "$VERBOSE" -ge 1 ] ++ then ++ echo >&2 "Convert to XSL-FO" ++ fi ++ echo "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" ++ ;; ++post-process) ++ # Get the FO format script to do the rest ++ sh "$(dirname "$0")/../fo/$(basename "$0")" "$1" ++ ;; ++esac +diff -urNp xmlto-0.0.21-orig/format/xhtml1/txt xmlto-0.0.21/format/xhtml1/txt +--- xmlto-0.0.21-orig/format/xhtml1/txt 1970-01-01 01:00:00.000000000 +0100 ++++ xmlto-0.0.21/format/xhtml1/txt 2009-03-16 12:30:34.000000000 +0100 +@@ -0,0 +1,27 @@ ++if [ -x /usr/bin/w3m ] ++then ++ CONVERT=/usr/bin/w3m ++ ARGS="-T text/html -dump" ++elif [ -x /usr/bin/lynx ] ++then ++ CONVERT=/usr/bin/lynx ++ ARGS="-force_html -dump -nolist -width=72" ++elif [ -x /usr/bin/links ] ++then ++ CONVERT=/usr/bin/links ++ ARGS="-dump" ++else ++ echo >&2 "No way to convert HTML to text found." ++ exit 1 ++fi ++ ++case "$1" in ++post-process) ++ if [ "$VERBOSE" -ge 1 ] ++ then ++ echo >&2 "Convert HTML to ASCII" ++ fi ++ ${CONVERT} ${ARGS} ${POSTARGS} ${XSLT_PROCESSED} > \ ++ "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).txt" ++ ;; ++esac +diff -urNp xmlto-0.0.21-orig/Makefile.am xmlto-0.0.21/Makefile.am +--- xmlto-0.0.21-orig/Makefile.am 2008-01-17 12:33:44.000000000 +0100 ++++ xmlto-0.0.21/Makefile.am 2009-03-16 12:49:27.000000000 +0100 +@@ -28,6 +28,11 @@ nobase_pkgdata_DATA = format/docbook/dvi + format/fo/pcl \ + format/fo/svg \ + format/fo/txt \ ++ format/xhtml1/dvi \ ++ format/xhtml1/fo \ ++ format/xhtml1/pdf \ ++ format/xhtml1/ps \ ++ format/xhtml1/txt \ + xmlto.mak + + EXTRA_DIST = xmlto.spec \ +@@ -56,6 +61,11 @@ EXTRA_DIST = xmlto.spec \ + format/fo/pcl \ + format/fo/svg \ + format/fo/txt \ ++ format/xhtml1/dvi \ ++ format/xhtml1/fo \ ++ format/xhtml1/pdf \ ++ format/xhtml1/ps \ ++ format/xhtml1/txt \ + doc/xmlto.xml \ + doc/xmlif.xml \ + xmlto.mak \ +diff -urNp xmlto-0.0.21-orig/Makefile.in xmlto-0.0.21/Makefile.in +--- xmlto-0.0.21-orig/Makefile.in 2008-05-30 15:57:32.000000000 +0200 ++++ xmlto-0.0.21/Makefile.in 2009-03-16 12:50:52.000000000 +0100 +@@ -208,6 +208,11 @@ nobase_pkgdata_DATA = format/docbook/dvi + format/fo/pcl \ + format/fo/svg \ + format/fo/txt \ ++ format/xhtml1/dvi \ ++ format/xhtml1/fo \ ++ format/xhtml1/pdf \ ++ format/xhtml1/ps \ ++ format/xhtml1/txt \ + xmlto.mak + + EXTRA_DIST = xmlto.spec \ +@@ -236,6 +241,11 @@ EXTRA_DIST = xmlto.spec \ + format/fo/pcl \ + format/fo/svg \ + format/fo/txt \ ++ format/xhtml1/dvi \ ++ format/xhtml1/fo \ ++ format/xhtml1/pdf \ ++ format/xhtml1/ps \ ++ format/xhtml1/txt \ + doc/xmlto.xml \ + doc/xmlif.xml \ + xmlto.mak \ +diff -urNp xmlto-0.0.21-orig/xmlto.in xmlto-0.0.21/xmlto.in +--- xmlto-0.0.21-orig/xmlto.in 2009-03-16 14:22:58.000000000 +0100 ++++ xmlto-0.0.21/xmlto.in 2009-03-16 12:27:49.000000000 +0100 +@@ -351,12 +351,15 @@ esac + # sed -e 's/^]*?>//g' -e 's/^]*>//g' -e 's/^<\([^ ]*\).*$/\1/') + + # Seems reasonable fix the file command and teach it to identify the DTD/Schema but this is faster to write: +-rootel=$(echo "xpath *" | xmllint --shell $INPUT_FILE 2> /dev/null |head -n 3 |tail -n 1 | cut -f 4 -d " " ) ++rootel=$(echo "xpath *" | xmllint --shell $INPUT_FILE 2> /dev/null | head -n 3 |tail -n 1 | cut -f 4 -d " " ) + + case $(echo $rootel) in + fo:root) + SOURCE_FORMAT="fo" + ;; ++html) ++ SOURCE_FORMAT="xhtml1" ++ ;; + esac + + [ "$VERBOSE" -ge 1 ] && echo >&2 "Source format: ${SOURCE_FORMAT} / root element: ${rootel} " diff --git a/xmlto-xmllintoptions.patch b/xmlto-xmllintoptions.patch index a874a9a..3ee950b 100644 --- a/xmlto-xmllintoptions.patch +++ b/xmlto-xmllintoptions.patch @@ -8,8 +8,8 @@ diff -urNp xmlto-0.0.21-orig/xmlto.in xmlto-0.0.21/xmlto.in - echo >&2 "xmllint >/dev/null --xinclude --postvalid \"$INPUT_FILE\"" - xmllint >/dev/null --xinclude --postvalid "$INPUT_FILE" 2>"${VALIDATION}" + echo >&2 \ -+ "xmllint >/dev/null --nonet --xinclude --postvalid \"$INPUT_FILE\"" -+ xmllint >/dev/null --nonet --xinclude --postvalid \ ++ "xmllint >/dev/null --nonet --xinclude --postvalid --noent \"$INPUT_FILE\"" ++ xmllint >/dev/null --nonet --xinclude --postvalid --noent \ + "$INPUT_FILE" 2>"${VALIDATION}" xmllint_status=$? if [ $xmllint_status -ne 0 ] diff --git a/xmlto.spec b/xmlto.spec index 2bea4f6..133637d 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.21 -Release: 8%{?dist} +Release: 9%{?dist} #xmlto is released under GPLv2+ license, xmlif under GPL+ license License: GPLv2+ and GPL+ Group: Applications/System @@ -13,6 +13,7 @@ Source0: https://fedorahosted.org/releases/x/m/%{name}/%{name}-%{version}.tar.bz Patch0: xmlto-stringparam.patch Patch1: xmlto-libpaper.patch Patch2: xmlto-xmllintoptions.patch +Patch3: xmlto-xhtml1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -44,11 +45,25 @@ Requires: xmlto = %{version}-%{release} This subpackage contains xmlto backend scripts which do require PassiveTeX/TeX for functionality. +%package xhtml +Group: Applications/System +License: GPLv2+ +Summary: A set of xmlto backends for xhtml1 source format +# For functionality we need stylesheets xhtml2fo-style-xsl +Requires: xhtml2fo-style-xsl +# We require main package +Requires: xmlto = %{version}-%{release} + +%description xhtml +This subpackage contains xmlto backend scripts for processing +xhtml1 source format. + %prep %setup -q %patch0 -p1 -b .stringparam %patch1 -p1 -b .libpapercleanup %patch2 -p1 -b .xmllintoptions +%patch3 -p1 -b .xhtml1 %build %configure @@ -73,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_datadir}/xmlto/format/fo/dvi %exclude %{_datadir}/xmlto/format/fo/ps %exclude %{_datadir}/xmlto/format/fo/pdf +%exclude %dir %{_datadir}/xmlto/format/xhtml1/ +%exclude %{_datadir}/xmlto/format/xhtml1 + %files tex %defattr(-,root,root,-) @@ -80,8 +98,18 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xmlto/format/fo/ps %{_datadir}/xmlto/format/fo/pdf +%files xhtml +%defattr(-,root,root,-) +%dir %{_datadir}/xmlto/format/xhtml1/ +%{_datadir}/xmlto/format/xhtml1 + + %changelog -* Mon Mar 02 2009 Ondrej Vasik - 0.0.21-7 +* Mon Mar 16 2009 Ondrej Vasik - 0.0.21-9 +- reenable noent switch - bug is on lcdproc side +- add xhtml support(subpackage) (#145140) + +* Mon Mar 02 2009 Ondrej Vasik - 0.0.21-8 - temporarily disable noent switch - blocks lcdproc doc build (#488093) From 636d85c0dcaabf56e1a8594b6eeb777ba605a4e8 Mon Sep 17 00:00:00 2001 From: Ondrej Vasik Date: Wed, 25 Mar 2009 15:08:17 +0000 Subject: [PATCH 08/69] New version 0.0.22, autodetection for tools/program paths, consolidated error code handling, build warnings cleanup, various minor changes --- .cvsignore | 2 +- sources | 2 +- xmlto.spec | 22 +++++++++------------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.cvsignore b/.cvsignore index 44d5302..9b5cb54 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xmlto-0.0.21.tar.bz2 +xmlto-0.0.22.tar.bz2 diff --git a/sources b/sources index 602aff8..8491b84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cc2039dedc81f1a56b06e5fdac6f7570 xmlto-0.0.21.tar.bz2 +12f297dc7051e4fef08339980f88a1dd xmlto-0.0.22.tar.bz2 diff --git a/xmlto.spec b/xmlto.spec index 133637d..0cb4257 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -1,19 +1,14 @@ Summary: A tool for converting XML files to various formats Name: xmlto -Version: 0.0.21 -Release: 9%{?dist} -#xmlto is released under GPLv2+ license, xmlif under GPL+ license -License: GPLv2+ and GPL+ +Version: 0.0.22 +Release: 1%{?dist} +License: GPLv2+ 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: https://fedorahosted.org/releases/x/m/%{name}/%{name}-%{version}.tar.bz2 -Patch0: xmlto-stringparam.patch -Patch1: xmlto-libpaper.patch -Patch2: xmlto-xmllintoptions.patch -Patch3: xmlto-xhtml1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,7 +21,7 @@ Requires: docbook-xsl >= 1.56.0 Requires: text-www-browser Requires: libxslt Requires: docbook-dtds -Requires: util-linux, flex +Requires: util-linux, flex, which %description This is a package for converting XML files to various formats using XSL @@ -60,10 +55,6 @@ xhtml1 source format. %prep %setup -q -%patch0 -p1 -b .stringparam -%patch1 -p1 -b .libpapercleanup -%patch2 -p1 -b .xmllintoptions -%patch3 -p1 -b .xhtml1 %build %configure @@ -105,6 +96,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Mar 25 2009 Ondrej Vasik +- New version 0.0.22 +- autodetection for tools/program paths, consolidated + error code handling, build warnings cleanup + * Mon Mar 16 2009 Ondrej Vasik - 0.0.21-9 - reenable noent switch - bug is on lcdproc side - add xhtml support(subpackage) (#145140) From a1d9e193a89957e285358131d3012ee21a88df89 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 08:13:24 +0000 Subject: [PATCH 09/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index 0cb4257..c876dd6 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.22 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 0.0.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Mar 25 2009 Ondrej Vasik - New version 0.0.22 - autodetection for tools/program paths, consolidated From 08d01018c9a1368884cfbc1f953f75f68a72f8b8 Mon Sep 17 00:00:00 2001 From: Ondrej Vasik Date: Sat, 1 Aug 2009 16:12:42 +0000 Subject: [PATCH 10/69] make subpackages noarch, preserve timestamps - merge review (#226568) --- xmlto-libpaper.patch | 28 ------ xmlto-stringparam.patch | 22 ----- xmlto-xhtml1.patch | 172 ------------------------------------- xmlto-xmllintoptions.patch | 16 ---- xmlto.spec | 13 ++- 5 files changed, 10 insertions(+), 241 deletions(-) delete mode 100644 xmlto-libpaper.patch delete mode 100644 xmlto-stringparam.patch delete mode 100644 xmlto-xhtml1.patch delete mode 100644 xmlto-xmllintoptions.patch diff --git a/xmlto-libpaper.patch b/xmlto-libpaper.patch deleted file mode 100644 index 51c3c56..0000000 --- a/xmlto-libpaper.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 - -@@ -106,6 +106,8 @@ then - if [ -n "$paperheight" -a -n "$paperwidth" ] - then - papersizemod=$(${MKTEMP} ${TMPDIR:-/tmp}/@PACKAGE@-xsl.XXXXXX) -+ CLEANFILES[$CLEANFILE_COUNT]="$papersizemod" -+ CLEANFILE_COUNT=$(($CLEANFILE_COUNT + 1)) - cat << EOF > "$papersizemod" - - - Braden McDaniel - Andreas Hoenen - Graham Wilson -+Joseph Parmelee -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) diff --git a/xmlto-xhtml1.patch b/xmlto-xhtml1.patch deleted file mode 100644 index 2c54241..0000000 --- a/xmlto-xhtml1.patch +++ /dev/null @@ -1,172 +0,0 @@ -diff -urNp xmlto-0.0.21-orig/format/xhtml1/dvi xmlto-0.0.21/format/xhtml1/dvi ---- xmlto-0.0.21-orig/format/xhtml1/dvi 1970-01-01 01:00:00.000000000 +0100 -+++ xmlto-0.0.21/format/xhtml1/dvi 2009-03-16 12:30:34.000000000 +0100 -@@ -0,0 +1,13 @@ -+case "$1" in -+stylesheet) -+ if [ "$VERBOSE" -ge 1 ] -+ then -+ echo >&2 "Convert to XSL-FO" -+ fi -+ echo "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" -+ ;; -+post-process) -+ # Get the FO format script to do the rest -+ sh "$(dirname "$0")/../fo/$(basename "$0")" "$1" -+ ;; -+esac -diff -urNp xmlto-0.0.21-orig/format/xhtml1/fo xmlto-0.0.21/format/xhtml1/fo ---- xmlto-0.0.21-orig/format/xhtml1/fo 1970-01-01 01:00:00.000000000 +0100 -+++ xmlto-0.0.21/format/xhtml1/fo 2009-03-16 12:30:34.000000000 +0100 -@@ -0,0 +1,12 @@ -+case "$1" in -+stylesheet) -+ if [ "$VERBOSE" -ge 1 ] -+ then -+ echo >&2 "Convert to XSL-FO" -+ fi -+ echo "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" -+ ;; -+post-process) -+ cp "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).fo" -+ ;; -+esac -diff -urNp xmlto-0.0.21-orig/format/xhtml1/pdf xmlto-0.0.21/format/xhtml1/pdf ---- xmlto-0.0.21-orig/format/xhtml1/pdf 1970-01-01 01:00:00.000000000 +0100 -+++ xmlto-0.0.21/format/xhtml1/pdf 2009-03-16 12:30:34.000000000 +0100 -@@ -0,0 +1,13 @@ -+case "$1" in -+stylesheet) -+ if [ "$VERBOSE" -ge 1 ] -+ then -+ echo >&2 "Convert to XSL-FO" -+ fi -+ echo "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" -+ ;; -+post-process) -+ # Get the FO format script to do the rest -+ sh "$(dirname "$0")/../fo/$(basename "$0")" "$1" -+ ;; -+esac -diff -urNp xmlto-0.0.21-orig/format/xhtml1/ps xmlto-0.0.21/format/xhtml1/ps ---- xmlto-0.0.21-orig/format/xhtml1/ps 1970-01-01 01:00:00.000000000 +0100 -+++ xmlto-0.0.21/format/xhtml1/ps 2009-03-16 12:30:34.000000000 +0100 -@@ -0,0 +1,13 @@ -+case "$1" in -+stylesheet) -+ if [ "$VERBOSE" -ge 1 ] -+ then -+ echo >&2 "Convert to XSL-FO" -+ fi -+ echo "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" -+ ;; -+post-process) -+ # Get the FO format script to do the rest -+ sh "$(dirname "$0")/../fo/$(basename "$0")" "$1" -+ ;; -+esac -diff -urNp xmlto-0.0.21-orig/format/xhtml1/txt xmlto-0.0.21/format/xhtml1/txt ---- xmlto-0.0.21-orig/format/xhtml1/txt 1970-01-01 01:00:00.000000000 +0100 -+++ xmlto-0.0.21/format/xhtml1/txt 2009-03-16 12:30:34.000000000 +0100 -@@ -0,0 +1,27 @@ -+if [ -x /usr/bin/w3m ] -+then -+ CONVERT=/usr/bin/w3m -+ ARGS="-T text/html -dump" -+elif [ -x /usr/bin/lynx ] -+then -+ CONVERT=/usr/bin/lynx -+ ARGS="-force_html -dump -nolist -width=72" -+elif [ -x /usr/bin/links ] -+then -+ CONVERT=/usr/bin/links -+ ARGS="-dump" -+else -+ echo >&2 "No way to convert HTML to text found." -+ exit 1 -+fi -+ -+case "$1" in -+post-process) -+ if [ "$VERBOSE" -ge 1 ] -+ then -+ echo >&2 "Convert HTML to ASCII" -+ fi -+ ${CONVERT} ${ARGS} ${POSTARGS} ${XSLT_PROCESSED} > \ -+ "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).txt" -+ ;; -+esac -diff -urNp xmlto-0.0.21-orig/Makefile.am xmlto-0.0.21/Makefile.am ---- xmlto-0.0.21-orig/Makefile.am 2008-01-17 12:33:44.000000000 +0100 -+++ xmlto-0.0.21/Makefile.am 2009-03-16 12:49:27.000000000 +0100 -@@ -28,6 +28,11 @@ nobase_pkgdata_DATA = format/docbook/dvi - format/fo/pcl \ - format/fo/svg \ - format/fo/txt \ -+ format/xhtml1/dvi \ -+ format/xhtml1/fo \ -+ format/xhtml1/pdf \ -+ format/xhtml1/ps \ -+ format/xhtml1/txt \ - xmlto.mak - - EXTRA_DIST = xmlto.spec \ -@@ -56,6 +61,11 @@ EXTRA_DIST = xmlto.spec \ - format/fo/pcl \ - format/fo/svg \ - format/fo/txt \ -+ format/xhtml1/dvi \ -+ format/xhtml1/fo \ -+ format/xhtml1/pdf \ -+ format/xhtml1/ps \ -+ format/xhtml1/txt \ - doc/xmlto.xml \ - doc/xmlif.xml \ - xmlto.mak \ -diff -urNp xmlto-0.0.21-orig/Makefile.in xmlto-0.0.21/Makefile.in ---- xmlto-0.0.21-orig/Makefile.in 2008-05-30 15:57:32.000000000 +0200 -+++ xmlto-0.0.21/Makefile.in 2009-03-16 12:50:52.000000000 +0100 -@@ -208,6 +208,11 @@ nobase_pkgdata_DATA = format/docbook/dvi - format/fo/pcl \ - format/fo/svg \ - format/fo/txt \ -+ format/xhtml1/dvi \ -+ format/xhtml1/fo \ -+ format/xhtml1/pdf \ -+ format/xhtml1/ps \ -+ format/xhtml1/txt \ - xmlto.mak - - EXTRA_DIST = xmlto.spec \ -@@ -236,6 +241,11 @@ EXTRA_DIST = xmlto.spec \ - format/fo/pcl \ - format/fo/svg \ - format/fo/txt \ -+ format/xhtml1/dvi \ -+ format/xhtml1/fo \ -+ format/xhtml1/pdf \ -+ format/xhtml1/ps \ -+ format/xhtml1/txt \ - doc/xmlto.xml \ - doc/xmlif.xml \ - xmlto.mak \ -diff -urNp xmlto-0.0.21-orig/xmlto.in xmlto-0.0.21/xmlto.in ---- xmlto-0.0.21-orig/xmlto.in 2009-03-16 14:22:58.000000000 +0100 -+++ xmlto-0.0.21/xmlto.in 2009-03-16 12:27:49.000000000 +0100 -@@ -351,12 +351,15 @@ esac - # sed -e 's/^]*?>//g' -e 's/^]*>//g' -e 's/^<\([^ ]*\).*$/\1/') - - # Seems reasonable fix the file command and teach it to identify the DTD/Schema but this is faster to write: --rootel=$(echo "xpath *" | xmllint --shell $INPUT_FILE 2> /dev/null |head -n 3 |tail -n 1 | cut -f 4 -d " " ) -+rootel=$(echo "xpath *" | xmllint --shell $INPUT_FILE 2> /dev/null | head -n 3 |tail -n 1 | cut -f 4 -d " " ) - - case $(echo $rootel) in - fo:root) - SOURCE_FORMAT="fo" - ;; -+html) -+ SOURCE_FORMAT="xhtml1" -+ ;; - esac - - [ "$VERBOSE" -ge 1 ] && echo >&2 "Source format: ${SOURCE_FORMAT} / root element: ${rootel} " diff --git a/xmlto-xmllintoptions.patch b/xmlto-xmllintoptions.patch deleted file mode 100644 index 3ee950b..0000000 --- a/xmlto-xmllintoptions.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 --nonet --xinclude --postvalid --noent \"$INPUT_FILE\"" -+ xmllint >/dev/null --nonet --xinclude --postvalid --noent \ -+ "$INPUT_FILE" 2>"${VALIDATION}" - xmllint_status=$? - if [ $xmllint_status -ne 0 ] - then diff --git a/xmlto.spec b/xmlto.spec index c876dd6..4982b89 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.22 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -35,6 +35,8 @@ Summary: A set of xmlto backends with TeX requirements Requires: passivetex >= 1.11 # We require main package Requires: xmlto = %{version}-%{release} +BuildArch: noarch + %description tex This subpackage contains xmlto backend scripts which do require @@ -48,6 +50,7 @@ Summary: A set of xmlto backends for xhtml1 source format Requires: xhtml2fo-style-xsl # We require main package Requires: xmlto = %{version}-%{release} +BuildArch: noarch %description xhtml This subpackage contains xmlto backend scripts for processing @@ -65,7 +68,7 @@ make check %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %clean rm -rf $RPM_BUILD_ROOT @@ -96,10 +99,14 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Aug 01 2009 Ondrej Vasik - 0.0.22-3 +- make subpackages noarch, preserve timestamps - merge + review (#226568) + * Mon Jul 27 2009 Fedora Release Engineering - 0.0.22-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild -* Wed Mar 25 2009 Ondrej Vasik +* Wed Mar 25 2009 Ondrej Vasik - 0.0.22-1 - New version 0.0.22 - autodetection for tools/program paths, consolidated error code handling, build warnings cleanup From adc8f9a61b25f42374c72917194013e4aa012fcb Mon Sep 17 00:00:00 2001 From: Ondrej Vasik Date: Mon, 21 Sep 2009 13:51:15 +0000 Subject: [PATCH 11/69] New version 0.0.23 --- .cvsignore | 2 +- sources | 2 +- xmlto.spec | 17 +++++++++++++---- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9b5cb54..8603267 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xmlto-0.0.22.tar.bz2 +xmlto-0.0.23.tar.bz2 diff --git a/sources b/sources index 8491b84..cb16b93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -12f297dc7051e4fef08339980f88a1dd xmlto-0.0.22.tar.bz2 +3001d6bb2bbc2c8f6c2301f05120f074 xmlto-0.0.23.tar.bz2 diff --git a/xmlto.spec b/xmlto.spec index 4982b89..c064425 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.22 -Release: 3%{?dist} +Version: 0.0.23 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -21,7 +21,7 @@ Requires: docbook-xsl >= 1.56.0 Requires: text-www-browser Requires: libxslt Requires: docbook-dtds -Requires: util-linux, flex, which +Requires: util-linux, flex %description This is a package for converting XML files to various formats using XSL @@ -95,10 +95,19 @@ rm -rf $RPM_BUILD_ROOT %files xhtml %defattr(-,root,root,-) %dir %{_datadir}/xmlto/format/xhtml1/ -%{_datadir}/xmlto/format/xhtml1 +%{_datadir}/xmlto/format/xhtml1/* %changelog +* Mon Sep 21 2009 Ondrej Vasik - 0.0.23-1 +- New version 0.0.23 +- added autodetection for more common tools like + gnu cp or tail +- added option --noautosize to prevent overriding + of user-defined or system-default paper size +- use shell built-in 'type -t' instead of 'which' + utility for detection of file availability + * Sat Aug 01 2009 Ondrej Vasik - 0.0.22-3 - make subpackages noarch, preserve timestamps - merge review (#226568) From 233096f28f305965ad7e21d1d4be2d14e92dfe35 Mon Sep 17 00:00:00 2001 From: Ondrej Vasik Date: Thu, 24 Sep 2009 15:24:09 +0000 Subject: [PATCH 12/69] ensure the default shell is /bin/bash instead of /bin/sh --- xmlto.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmlto.spec b/xmlto.spec index c064425..121f1dc 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: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -60,7 +60,7 @@ xhtml1 source format. %setup -q %build -%configure +%configure BASH=/bin/bash make %{?_smp_mflags} %check @@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Sep 24 2009 Ondrej Vasik - 0.0.23-2 +- ensure the default shell is /bin/bash instead of /bin/sh + * Mon Sep 21 2009 Ondrej Vasik - 0.0.23-1 - New version 0.0.23 - added autodetection for more common tools like From b88a1bd76d1c94d82bae0b2cf27895a449a0f503 Mon Sep 17 00:00:00 2001 From: Ondrej Vasik Date: Tue, 13 Oct 2009 12:21:52 +0000 Subject: [PATCH 13/69] workaround passivetex limitation for chapter titles starting with L(#526273) --- xmlto-0.0.23-Lchapterpassivetex.patch | 45 +++++++++++++++++++++++++++ xmlto.spec | 8 ++++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 xmlto-0.0.23-Lchapterpassivetex.patch diff --git a/xmlto-0.0.23-Lchapterpassivetex.patch b/xmlto-0.0.23-Lchapterpassivetex.patch new file mode 100644 index 0000000..3c1d2b0 --- /dev/null +++ b/xmlto-0.0.23-Lchapterpassivetex.patch @@ -0,0 +1,45 @@ +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 121f1dc..9a490ec 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: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -22,6 +22,7 @@ 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 @@ -58,6 +59,7 @@ xhtml1 source format. %prep %setup -q +%patch1 -p1 %build %configure BASH=/bin/bash @@ -99,6 +101,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Oct 13 2009 Ondrej Vasik - 0.0.23-3 +- workaround passivetex limitation for chapter titles starting + with L(#526273) + * Fri Sep 24 2009 Ondrej Vasik - 0.0.23-2 - ensure the default shell is /bin/bash instead of /bin/sh From 27db4f2fa7aea58745377dc35f0fbf9037e953cc Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:41:00 +0000 Subject: [PATCH 14/69] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index adf4280..98f8070 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xmlto -# $Id: Makefile,v 1.1 2004/09/09 14:53:32 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:32:30 notting Exp $ NAME := xmlto SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 5d23ba483f434a86682e48c256e1a1269572f604 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:57:58 +0000 Subject: [PATCH 15/69] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 98f8070..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xmlto -# $Id: Makefile,v 1.2 2007/10/15 19:32:30 notting Exp $ -NAME := xmlto -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From d3c593e015091c7baebd0de5b6fd414827fbdd3c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 23:36:01 -0600 Subject: [PATCH 16/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index 9a490ec..85c7833 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: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0.0.23-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Oct 13 2009 Ondrej Vasik - 0.0.23-3 - workaround passivetex limitation for chapter titles starting with L(#526273) From f95a953e88fd74e93abc0820d7a5f4bf1218af57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= Date: Thu, 14 Jul 2011 13:47:19 +0200 Subject: [PATCH 17/69] new release 0.0.24, basic support for docbook->epub conversion, use backend extensions by default (--noextensions) to disable it --- .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 f8a1435da2f604c5fe5ed976ca2faf0d6cc074f4 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:02:11 +0100 Subject: [PATCH 18/69] fix the functionality of fop.extensions (#757035) --- xmlto.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index e2f5b6c..7171a36 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 - 0.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 50e5ddf5078c0314ecd0841b9b3122b3df2232ca 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:05:32 +0100 Subject: [PATCH 19/69] forgotten patch --- xmlto-fopextensions.patch | 49 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) 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) From 297e1d4731ea2151e7339d70fbb6e4c2adcdaf3d 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:12:55 +0100 Subject: [PATCH 20/69] Temporarily require autoconf/automake --- xmlto.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xmlto.spec b/xmlto.spec index 7171a36..e67e81a 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -16,6 +16,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: docbook-xsl >= 1.56.0 BuildRequires: libxslt BuildRequires: util-linux, flex +#disable it when removing the patch +BuildRequires: autoconf automake # We rely heavily on the DocBook XSL stylesheets! Requires: docbook-xsl >= 1.74.2 From f476f83cdfa9cd08d43dc282f9ddc28adbe64208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= Date: Fri, 2 Dec 2011 09:37:20 +0100 Subject: [PATCH 21/69] new release 0.0.25, fix handling of external data objects with fop --- .gitignore | 1 + sources | 2 +- xmlto-fopextensions.patch | 49 --------------------------------------- xmlto.spec | 13 +++++------ 4 files changed, 8 insertions(+), 57 deletions(-) delete mode 100644 xmlto-fopextensions.patch diff --git a/.gitignore b/.gitignore index f7ef76a..2193965 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ xmlto-0.0.23.tar.bz2 /xmlto-0.0.24.tar.bz2 +/xmlto-0.0.25.tar.bz2 diff --git a/sources b/sources index 6e396e3..03a9d63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9d45bbe43f7c66c6bf585ba6635df31a xmlto-0.0.24.tar.bz2 +6b6267b1470f8571fe5f63a128970364 xmlto-0.0.25.tar.bz2 diff --git a/xmlto-fopextensions.patch b/xmlto-fopextensions.patch deleted file mode 100644 index b16ef3a..0000000 --- a/xmlto-fopextensions.patch +++ /dev/null @@ -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) diff --git a/xmlto.spec b/xmlto.spec index e67e81a..3e9ae2c 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: 2%{?dist} +Version: 0.0.25 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System #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 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) BuildRequires: docbook-xsl >= 1.56.0 BuildRequires: libxslt BuildRequires: util-linux, flex -#disable it when removing the patch -BuildRequires: autoconf automake # We rely heavily on the DocBook XSL stylesheets! Requires: docbook-xsl >= 1.74.2 @@ -61,10 +58,8 @@ xhtml1 source format. %prep %setup -q -%patch1 -p1 -b .extensions %build -autoreconf %configure BASH=/bin/bash make %{?_smp_mflags} @@ -104,6 +99,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Dec 02 2011 Ondrej Vasik - 0.0.25-1 +- fix handling of external data objects with fop + (deb #568894) + * Tue Nov 29 2011 Ondrej Vasik - 0.0.24-2 - fix the functionality of fop.extensions (#757035) From 7cdf5af2f0fedec646813f085903fd9479082d2e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 03:05:20 -0600 Subject: [PATCH 22/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index 3e9ae2c..aba17f7 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.25 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0.0.25-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Fri Dec 02 2011 Ondrej Vasik - 0.0.25-1 - fix handling of external data objects with fop (deb #568894) From 19fc980054fc13d4e7c4a1dd295ed4bc11e8e7ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= Date: Fri, 8 Jun 2012 20:33:52 +0200 Subject: [PATCH 23/69] fix the noextensions option (#830266) --- xmlto-noextensions.patch | 12 ++++++++++++ xmlto.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 xmlto-noextensions.patch diff --git a/xmlto-noextensions.patch b/xmlto-noextensions.patch new file mode 100644 index 0000000..1ff2415 --- /dev/null +++ b/xmlto-noextensions.patch @@ -0,0 +1,12 @@ +diff -urNp xmlto-0.0.25-orig/xmlto.in xmlto-0.0.25/xmlto.in +--- xmlto-0.0.25-orig/xmlto.in 2011-11-29 12:49:57.000000000 +0100 ++++ xmlto-0.0.25/xmlto.in 2012-06-08 20:30:11.492008539 +0200 +@@ -262,7 +262,7 @@ ZIP_PATH=@ZIP@ + + # Process any options + ARGS=$(${GETOPT} \ +- --longoptions=help,version,extensions,searchpath:,skip-validation,stringparam:,noclean,noautosize,with-fop,with-dblatex \ ++ --longoptions=help,version,extensions,searchpath:,skip-validation,stringparam:,noclean,noautosize,noextensions,with-fop,with-dblatex \ + -n xmlto -- x:m:o:p:v "$@") + [ $? != 0 ] && { usage; exit 1; } + eval set -- "$ARGS" diff --git a/xmlto.spec b/xmlto.spec index aba17f7..ce9b1dd 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.25 -Release: 2%{?dist} +Release: 3%{?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-noextensions.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -58,6 +59,7 @@ xhtml1 source format. %prep %setup -q +%patch1 -p1 -b .noextension %build %configure BASH=/bin/bash @@ -99,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jun 08 2012 Ondrej Vasik - 0.0.25-3 +- fix the noextensions option (#830266) + * Sat Jan 14 2012 Fedora Release Engineering - 0.0.25-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 01de564e7537ada18339d96a7841e8aee9e322c9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 00:57:37 -0500 Subject: [PATCH 24/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index ce9b1dd..babba34 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.25 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 0.0.25-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jun 08 2012 Ondrej Vasik - 0.0.25-3 - fix the noextensions option (#830266) From 4c9e4b7785988f3d5590a61455e104c7c1191f81 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 21:51:40 -0600 Subject: [PATCH 25/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index babba34..b137926 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.25 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 0.0.25-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Jul 22 2012 Fedora Release Engineering - 0.0.25-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 2dd07b3abc3c80d472dcf4835c42577d7e3c17f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= Date: Tue, 9 Apr 2013 09:56:19 +0200 Subject: [PATCH 26/69] drop hard requirement for text-www-browser --- xmlto.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xmlto.spec b/xmlto.spec index b137926..31bd1dd 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.25 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -19,7 +19,6 @@ BuildRequires: util-linux, flex # We rely heavily on the DocBook XSL stylesheets! Requires: docbook-xsl >= 1.74.2 -Requires: text-www-browser Requires: libxslt Requires: docbook-dtds Requires: util-linux, flex @@ -101,6 +100,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 09 2013 Ondrej Vasik - 0.0.25-6 +- drop hard requirement for text-www-browser (any package that + needs docbook->txt for build may buildrequire any of + w3m/lynx/elinks as suggested by script) + * Fri Feb 15 2013 Fedora Release Engineering - 0.0.25-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From fb34f29f3ec4523e974cf5b29fe7eede9f1cb3a2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 03:32:54 -0500 Subject: [PATCH 27/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index 31bd1dd..0c53dca 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.25 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 0.0.25-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Apr 09 2013 Ondrej Vasik - 0.0.25-6 - drop hard requirement for text-www-browser (any package that needs docbook->txt for build may buildrequire any of From 217212a875f3ca0938ddd2bf5f0d9949afd98cc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= Date: Sat, 5 Apr 2014 15:22:58 +0200 Subject: [PATCH 28/69] New version 0.0.26 --- .gitignore | 1 + sources | 2 +- xmlto-noextensions.patch | 12 ------------ xmlto.spec | 19 +++++++++---------- 4 files changed, 11 insertions(+), 23 deletions(-) delete mode 100644 xmlto-noextensions.patch diff --git a/.gitignore b/.gitignore index 2193965..a2d4cd5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ xmlto-0.0.23.tar.bz2 /xmlto-0.0.24.tar.bz2 /xmlto-0.0.25.tar.bz2 +/xmlto-0.0.26.tar.bz2 diff --git a/sources b/sources index 03a9d63..b19abb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6b6267b1470f8571fe5f63a128970364 xmlto-0.0.25.tar.bz2 +c90a47c774e0963581c1ba57235f64f4 xmlto-0.0.26.tar.bz2 diff --git a/xmlto-noextensions.patch b/xmlto-noextensions.patch deleted file mode 100644 index 1ff2415..0000000 --- a/xmlto-noextensions.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNp xmlto-0.0.25-orig/xmlto.in xmlto-0.0.25/xmlto.in ---- xmlto-0.0.25-orig/xmlto.in 2011-11-29 12:49:57.000000000 +0100 -+++ xmlto-0.0.25/xmlto.in 2012-06-08 20:30:11.492008539 +0200 -@@ -262,7 +262,7 @@ ZIP_PATH=@ZIP@ - - # Process any options - ARGS=$(${GETOPT} \ -- --longoptions=help,version,extensions,searchpath:,skip-validation,stringparam:,noclean,noautosize,with-fop,with-dblatex \ -+ --longoptions=help,version,extensions,searchpath:,skip-validation,stringparam:,noclean,noautosize,noextensions,with-fop,with-dblatex \ - -n xmlto -- x:m:o:p:v "$@") - [ $? != 0 ] && { usage; exit 1; } - eval set -- "$ARGS" diff --git a/xmlto.spec b/xmlto.spec index 0c53dca..b6bd858 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.25 -Release: 7%{?dist} +Version: 0.0.26 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -9,16 +9,14 @@ 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-noextensions.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: docbook-xsl >= 1.56.0 +BuildRequires: docbook-xsl BuildRequires: libxslt BuildRequires: util-linux, flex # We rely heavily on the DocBook XSL stylesheets! -Requires: docbook-xsl >= 1.74.2 +Requires: docbook-xsl Requires: libxslt Requires: docbook-dtds Requires: util-linux, flex @@ -58,7 +56,6 @@ xhtml1 source format. %prep %setup -q -%patch1 -p1 -b .noextension %build %configure BASH=/bin/bash @@ -71,9 +68,6 @@ make check rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) %doc COPYING ChangeLog README AUTHORS NEWS @@ -100,6 +94,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Apr 04 2014 Ondrej Vasik - 0.0.26-1 +- New version 0.0.26 +- fix build with automake 1.13+ +- fix warning in searchpath option + * Sun Aug 04 2013 Fedora Release Engineering - 0.0.25-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From db16a7365d4cb362220bc53ebd6b4c5778b9a615 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 01:09:24 -0500 Subject: [PATCH 29/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index b6bd858..fd4e905 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.26 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -94,6 +94,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 0.0.26-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Apr 04 2014 Ondrej Vasik - 0.0.26-1 - New version 0.0.26 - fix build with automake 1.13+ From fc244bdffb0e7d5413fbf77019b18f0efd8a5570 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 10:16:51 +0000 Subject: [PATCH 30/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index fd4e905..cba3392 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.26 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -94,6 +94,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 0.0.26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 0.0.26-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From bd9ef9d20d6931317c68902922b9575f83dbc655 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:10:19 +0000 Subject: [PATCH 31/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index cba3392..b0458bd 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.26 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -94,6 +94,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 0.0.26-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Aug 18 2014 Fedora Release Engineering - 0.0.26-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From e48989d67d1ef23c72e9cd8a86009333faffe1dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= Date: Tue, 10 Nov 2015 13:11:39 +0100 Subject: [PATCH 32/69] New version of xmlto - 0.0.27 --- .gitignore | 1 + sources | 2 +- xmlto.spec | 11 +++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a2d4cd5..30a97d6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ xmlto-0.0.23.tar.bz2 /xmlto-0.0.24.tar.bz2 /xmlto-0.0.25.tar.bz2 /xmlto-0.0.26.tar.bz2 +/xmlto-0.0.27.tar.bz2 diff --git a/sources b/sources index b19abb2..23ef1fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c90a47c774e0963581c1ba57235f64f4 xmlto-0.0.26.tar.bz2 +bd1189afde95083d81bad967e4b4526c xmlto-0.0.27.tar.bz2 diff --git a/xmlto.spec b/xmlto.spec index b0458bd..3931078 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.26 -Release: 4%{?dist} +Version: 0.0.27 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -94,6 +94,13 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %changelog +* Tue Nov 10 2015 Ondrej Vasik +- New version 0.0.27 +- remove several bashisms in scripts +- add new option --profile for preprocessing documents + with profiling stylesheet +- fix several potential crashes in xmlif (found by static analysis) + * Fri Jun 19 2015 Fedora Release Engineering - 0.0.26-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From d1ad87137ba3902b2a6d8321cc223f3b744301af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= Date: Tue, 10 Nov 2015 14:32:27 +0100 Subject: [PATCH 33/69] adjust changelog --- xmlto.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index 3931078..154fb0c 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -94,7 +94,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %changelog -* Tue Nov 10 2015 Ondrej Vasik +* Tue Nov 10 2015 Ondrej Vasik 0.0.27-1 - New version 0.0.27 - remove several bashisms in scripts - add new option --profile for preprocessing documents From 231938cbfcc70f681418b64256913c3defd369cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= Date: Wed, 18 Nov 2015 10:00:48 +0100 Subject: [PATCH 34/69] fix broken temp files removal, do not detect links browser as elinks --- .gitignore | 1 + sources | 2 +- xmlto.spec | 7 ++++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 30a97d6..1fd7dd1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ xmlto-0.0.23.tar.bz2 /xmlto-0.0.25.tar.bz2 /xmlto-0.0.26.tar.bz2 /xmlto-0.0.27.tar.bz2 +/xmlto-0.0.28.tar.bz2 diff --git a/sources b/sources index 23ef1fc..ffa6006 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bd1189afde95083d81bad967e4b4526c xmlto-0.0.27.tar.bz2 +93bab48d446c826399d130d959fe676f xmlto-0.0.28.tar.bz2 diff --git a/xmlto.spec b/xmlto.spec index 154fb0c..cfd9db4 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -1,6 +1,6 @@ Summary: A tool for converting XML files to various formats Name: xmlto -Version: 0.0.27 +Version: 0.0.28 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -94,6 +94,11 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %changelog +* Wed Nov 18 2015 Ondrej Vasik 0.0.28-1 +- New version 0.0.28 +- fix broken temp files removal +- do not detect links browser as elinks + * Tue Nov 10 2015 Ondrej Vasik 0.0.27-1 - New version 0.0.27 - remove several bashisms in scripts From b2dc2deae42d2786b8992bcf1946027cdc3a9576 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:37:11 +0000 Subject: [PATCH 35/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index cfd9db4..d4a2e4d 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.28 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -94,6 +94,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 0.0.28-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Nov 18 2015 Ondrej Vasik 0.0.28-1 - New version 0.0.28 - fix broken temp files removal From ac2d935244f5e6f9f89421354e4d5fd4ada671b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:58:28 +0000 Subject: [PATCH 36/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index d4a2e4d..2494c07 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.28 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -94,6 +94,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.0.28-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 0.0.28-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From c206991e2abe738be606306e8430c23c4c9208ab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:14:37 +0000 Subject: [PATCH 37/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index 2494c07..185272b 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.28 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -94,6 +94,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.0.28-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 0.0.28-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 428692d806fbd26235d94a328d81de1f84ecfd1c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:47:54 +0000 Subject: [PATCH 38/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index 185272b..c747ef4 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.28 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -94,6 +94,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.0.28-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 0.0.28-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From dd403b483709b896d8810f30b5753d7db851ba8e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:48:37 +0000 Subject: [PATCH 39/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index c747ef4..aa6c17d 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.28 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -94,6 +94,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.0.28-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 0.0.28-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 1bd6d9528f59ecadd8d5b2116d00a43f5ccaea34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= Date: Mon, 2 Jul 2018 13:41:50 +0200 Subject: [PATCH 40/69] Upstream moved to pagure.io/xmlto (#1502443) --- xmlto.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xmlto.spec b/xmlto.spec index aa6c17d..4468440 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -1,14 +1,14 @@ Summary: A tool for converting XML files to various formats Name: xmlto Version: 0.0.28 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ 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: https://fedorahosted.org/releases/x/m/%{name}/%{name}-%{version}.tar.bz2 +URL: https://pagure.io/xmlto/ +Source0: http://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2 BuildRequires: docbook-xsl @@ -94,6 +94,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %changelog +* Mon Jul 02 2018 Ondrej Vasik - 0.0.28-7 +- upstream moved to pagure.io/xmlto (#1502443) + * Fri Feb 09 2018 Fedora Release Engineering - 0.0.28-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From abf63c0ceef89c792ae5e312b374b171ab3832e0 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 3 Jul 2018 15:36:31 +0200 Subject: [PATCH 41/69] use the passivetex from texlive --- xmlto.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmlto.spec b/xmlto.spec index 4468440..d7b6c83 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.28 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -30,7 +30,7 @@ Group: Applications/System License: GPLv2+ Summary: A set of xmlto backends with TeX requirements # For full functionality, we need passivetex. -Requires: passivetex >= 1.11 +Requires: tex-passivetex # We require main package Requires: xmlto = %{version}-%{release} BuildArch: noarch @@ -94,6 +94,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %changelog +* Tue Jul 03 2018 Than Ngo - 0.0.28-8 +- use the passivetex from texlive + * Mon Jul 02 2018 Ondrej Vasik - 0.0.28-7 - upstream moved to pagure.io/xmlto (#1502443) From 9ef7ba6326d6073564d46e93ba206febaf57a43d Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Mon, 9 Jul 2018 23:55:17 -0500 Subject: [PATCH 42/69] Remove needless use of %defattr --- xmlto.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/xmlto.spec b/xmlto.spec index d7b6c83..48ead93 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -69,7 +69,6 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %files -%defattr(-,root,root,-) %doc COPYING ChangeLog README AUTHORS NEWS %{_bindir}/* %{_mandir}/*/* @@ -82,13 +81,11 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %files tex -%defattr(-,root,root,-) %{_datadir}/xmlto/format/fo/dvi %{_datadir}/xmlto/format/fo/ps %{_datadir}/xmlto/format/fo/pdf %files xhtml -%defattr(-,root,root,-) %dir %{_datadir}/xmlto/format/xhtml1/ %{_datadir}/xmlto/format/xhtml1/* From 3e236d3529600599db1b73517bc048f076f5845f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:24:25 +0000 Subject: [PATCH 43/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index 48ead93..b6af42b 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.28 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -91,6 +91,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.0.28-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jul 03 2018 Than Ngo - 0.0.28-8 - use the passivetex from texlive From d1640680d3d2a3d350380957477ca3f6712e7481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= Date: Sat, 21 Jul 2018 08:45:35 +0200 Subject: [PATCH 44/69] add BuildRequires for gcc (#1606744) --- xmlto.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index b6af42b..c021407 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.28 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Group: Applications/System #Older versions up to xmlto-0.0.20 @@ -14,6 +14,7 @@ Source0: http://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2 BuildRequires: docbook-xsl BuildRequires: libxslt BuildRequires: util-linux, flex +BuildRequires: gcc # We rely heavily on the DocBook XSL stylesheets! Requires: docbook-xsl @@ -91,6 +92,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %changelog +* Sat Jul 21 2018 Ondrej Vasik - 0.0.28-10 +- add BuildRequires for gcc (#1606744) + * Sat Jul 14 2018 Fedora Release Engineering - 0.0.28-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 595770eebc649db420e78a2692321df4ed28d726 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:31 +0100 Subject: [PATCH 45/69] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- xmlto.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/xmlto.spec b/xmlto.spec index c021407..c736171 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -3,7 +3,6 @@ Name: xmlto Version: 0.0.28 Release: 10%{?dist} License: GPLv2+ -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 @@ -27,7 +26,6 @@ This is a package for converting XML files to various formats using XSL stylesheets. %package tex -Group: Applications/System License: GPLv2+ Summary: A set of xmlto backends with TeX requirements # For full functionality, we need passivetex. @@ -42,7 +40,6 @@ This subpackage contains xmlto backend scripts which do require PassiveTeX/TeX for functionality. %package xhtml -Group: Applications/System License: GPLv2+ Summary: A set of xmlto backends for xhtml1 source format # For functionality we need stylesheets xhtml2fo-style-xsl From cde6feb4ae98f83adde68c91f1dc19632826bafa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:34:32 +0000 Subject: [PATCH 46/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index c736171..df58c0a 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.28 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ #Older versions up to xmlto-0.0.20 #URL: http://cyberelk.net/tim/xmlto/ @@ -89,6 +89,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.0.28-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 21 2018 Ondrej Vasik - 0.0.28-10 - add BuildRequires for gcc (#1606744) From a071eba2df929f16e7cf0fbb2195680bb7b2a90c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:22:14 +0000 Subject: [PATCH 47/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index df58c0a..2fa9739 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.28 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ #Older versions up to xmlto-0.0.20 #URL: http://cyberelk.net/tim/xmlto/ @@ -89,6 +89,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.0.28-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 0.0.28-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 750ad97f25385039b8a314f0c5fe862905e11fac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:37:22 +0000 Subject: [PATCH 48/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index 2fa9739..5f013b6 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.28 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ #Older versions up to xmlto-0.0.20 #URL: http://cyberelk.net/tim/xmlto/ @@ -89,6 +89,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0.0.28-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 0.0.28-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From b5b97b77baf77dd77d17d8df057f80ca1bed7d5c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:51:29 +0000 Subject: [PATCH 49/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index 5f013b6..8226b59 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.28 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ #Older versions up to xmlto-0.0.20 #URL: http://cyberelk.net/tim/xmlto/ @@ -89,6 +89,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.0.28-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 0.0.28-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 6fe374e55c980648fb505b9eb7f295bb5fed709d Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Thu, 24 Dec 2020 22:43:23 +0000 Subject: [PATCH 50/69] Spec file cleanup --- xmlto.spec | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/xmlto.spec b/xmlto.spec index 8226b59..cba7614 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -7,8 +7,7 @@ License: GPLv2+ #URL: http://cyberelk.net/tim/xmlto/ #Source0: http://cyberelk.net/tim/data/xmlto/stable/%{name}-%{version}.tar.bz2 URL: https://pagure.io/xmlto/ -Source0: http://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2 - +Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2 BuildRequires: docbook-xsl BuildRequires: libxslt @@ -34,7 +33,6 @@ Requires: tex-passivetex Requires: xmlto = %{version}-%{release} BuildArch: noarch - %description tex This subpackage contains xmlto backend scripts which do require PassiveTeX/TeX for functionality. @@ -57,17 +55,17 @@ xhtml1 source format. %build %configure BASH=/bin/bash -make %{?_smp_mflags} +%make_build %check make check %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +%make_install %files -%doc COPYING ChangeLog README AUTHORS NEWS +%license COPYING +%doc ChangeLog README AUTHORS NEWS %{_bindir}/* %{_mandir}/*/* %{_datadir}/xmlto @@ -77,7 +75,6 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %exclude %dir %{_datadir}/xmlto/format/xhtml1/ %exclude %{_datadir}/xmlto/format/xhtml1 - %files tex %{_datadir}/xmlto/format/fo/dvi %{_datadir}/xmlto/format/fo/ps @@ -87,7 +84,6 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %dir %{_datadir}/xmlto/format/xhtml1/ %{_datadir}/xmlto/format/xhtml1/* - %changelog * Wed Jul 29 2020 Fedora Release Engineering - 0.0.28-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild @@ -149,7 +145,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" * Sun Jun 08 2014 Fedora Release Engineering - 0.0.26-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild -* Sat Apr 04 2014 Ondrej Vasik - 0.0.26-1 +* Sat Apr 05 2014 Ondrej Vasik - 0.0.26-1 - New version 0.0.26 - fix build with automake 1.13+ - fix warning in searchpath option @@ -193,7 +189,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" - workaround passivetex limitation for chapter titles starting with L(#526273) -* Fri Sep 24 2009 Ondrej Vasik - 0.0.23-2 +* Thu Sep 24 2009 Ondrej Vasik - 0.0.23-2 - ensure the default shell is /bin/bash instead of /bin/sh * Mon Sep 21 2009 Ondrej Vasik - 0.0.23-1 @@ -250,7 +246,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" - xmlto-tex subpackage to prevent requirements for passivetex/tex for all backends(#454341) -* Mon Jun 20 2008 Ondrej Vasik - 0.0.21-1 +* Fri Jun 20 2008 Ondrej Vasik - 0.0.21-1 - new version 0.0.21 * Tue May 13 2008 Ondrej Vasik - 0.0.20-3 @@ -444,4 +440,4 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" - Built for Red Hat Linux. * Fri Nov 23 2001 Tim Waugh -- Initial spec file. +- Initial spec file. \ No newline at end of file From ec505df3b00008df0c42b60c355af131a24a995b Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:32:32 +0000 Subject: [PATCH 51/69] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xmlto.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xmlto.spec b/xmlto.spec index 8226b59..030b7ad 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -10,6 +10,7 @@ URL: https://pagure.io/xmlto/ Source0: http://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2 +BuildRequires: make BuildRequires: docbook-xsl BuildRequires: libxslt BuildRequires: util-linux, flex From b2b054b6728aee40811c241e815daf2cde49d892 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:10:50 +0000 Subject: [PATCH 52/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index 6cec6cb..172609d 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.28 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ #Older versions up to xmlto-0.0.20 #URL: http://cyberelk.net/tim/xmlto/ @@ -86,6 +86,9 @@ make check %{_datadir}/xmlto/format/xhtml1/* %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 0.0.28-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 0.0.28-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 9d30ba3427c2c530b41cfd67afe6eb0aa18fd311 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:44:08 +0000 Subject: [PATCH 53/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index 172609d..321fba7 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.28 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2+ #Older versions up to xmlto-0.0.20 #URL: http://cyberelk.net/tim/xmlto/ @@ -86,6 +86,9 @@ make check %{_datadir}/xmlto/format/xhtml1/* %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.0.28-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jan 28 2021 Fedora Release Engineering - 0.0.28-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 5b1dd40eff38f228683a79781829621f2f0cae4b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:16:53 +0000 Subject: [PATCH 54/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index 321fba7..6960d67 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.28 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2+ #Older versions up to xmlto-0.0.20 #URL: http://cyberelk.net/tim/xmlto/ @@ -86,6 +86,9 @@ make check %{_datadir}/xmlto/format/xhtml1/* %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.0.28-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 0.0.28-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 07c2956e53d047b1b608735dbaa4b0b64c0398bf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:18:50 +0000 Subject: [PATCH 55/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index 6960d67..5bd0f1f 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.28 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv2+ #Older versions up to xmlto-0.0.20 #URL: http://cyberelk.net/tim/xmlto/ @@ -86,6 +86,9 @@ make check %{_datadir}/xmlto/format/xhtml1/* %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.0.28-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 0.0.28-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 571fc033c0ff5d6cf448e2ca20d8ae8ac61a7cb8 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 24 Nov 2022 12:15:26 +0100 Subject: [PATCH 56/69] Apply upstream patches to support building in stricer C99 mode Related to: --- xmlto-c99-1.patch | 26 ++++++++++++++++++++++++++ xmlto-c99-2.patch | 35 +++++++++++++++++++++++++++++++++++ xmlto.spec | 11 ++++++++--- 3 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 xmlto-c99-1.patch create mode 100644 xmlto-c99-2.patch diff --git a/xmlto-c99-1.patch b/xmlto-c99-1.patch new file mode 100644 index 0000000..8ba8416 --- /dev/null +++ b/xmlto-c99-1.patch @@ -0,0 +1,26 @@ +commit 1375e2df75530cd198bd16ac3de38e2b0d126276 +Author: Thomas Kuehne +Date: Sat Dec 11 21:10:41 2021 +0100 + + fix -Wimplicit-int for ifsense + + fixes: + xmlif/xmlif.l:46:8: warning: type defaults to ‘int’ in declaration of ‘ifsense’ [-Wimplicit-int] + 46 | static ifsense; /* sense of last `if' or unless seen */ + | ^~~~~~~ + + Signed-off-by: Thomas Kuehne + +diff --git a/xmlif/xmlif.l b/xmlif/xmlif.l +index ac421367d47a2cd4..6e5970e147be21b1 100644 +--- a/xmlif/xmlif.l ++++ b/xmlif/xmlif.l +@@ -43,7 +43,7 @@ + + static char **selections; /* selection tokens */ + static int nselections; /* number of selections */ +-static ifsense; /* sense of last `if' or unless seen */ ++static int ifsense; /* sense of last `if' or unless seen */ + static char *attribute; /* last attribute scanned */ + + struct stack_t { diff --git a/xmlto-c99-2.patch b/xmlto-c99-2.patch new file mode 100644 index 0000000..0bdd32f --- /dev/null +++ b/xmlto-c99-2.patch @@ -0,0 +1,35 @@ +commit 8e34f087bf410bcc5fe445933d6ad9bae54f24b5 +Author: Thomas Kuehne +Date: Sat Dec 11 21:54:50 2021 +0100 + + Fix return type of main function + + Fixes: + xmlif/xmlif.l:242:1: warning: return type defaults to ‘int’ [-Wimplicit-int] + 242 | main(int argc, char *argv[]) + | ^~~~ + + Signed-off-by: Thomas Kuehne + +diff --git a/xmlif/xmlif.l b/xmlif/xmlif.l +index 6e5970e147be21b1..8bcc59216d41a3cb 100644 +--- a/xmlif/xmlif.l ++++ b/xmlif/xmlif.l +@@ -239,7 +239,7 @@ WS [ \t\n]* + + int yywrap() {exit(0);}; + +-main(int argc, char *argv[]) ++int main(int argc, char *argv[]) + { + int i; + +@@ -265,7 +265,7 @@ main(int argc, char *argv[]) + exit(1); + } + +- yylex(); ++ return yylex(); + } + + /* diff --git a/xmlto.spec b/xmlto.spec index 5bd0f1f..fce017b 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -1,13 +1,15 @@ Summary: A tool for converting XML files to various formats Name: xmlto Version: 0.0.28 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv2+ #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://pagure.io/xmlto/ Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2 +Patch0: xmlto-c99-1.patch +Patch1: xmlto-c99-2.patch BuildRequires: make BuildRequires: docbook-xsl @@ -52,7 +54,7 @@ This subpackage contains xmlto backend scripts for processing xhtml1 source format. %prep -%setup -q +%autosetup -p1 %build %configure BASH=/bin/bash @@ -86,6 +88,9 @@ make check %{_datadir}/xmlto/format/xhtml1/* %changelog +* Thu Nov 24 2022 Florian Weimer - 0.0.28-19 +- Apply upstream patches to support building in stricer C99 mode + * Sat Jul 23 2022 Fedora Release Engineering - 0.0.28-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild @@ -453,4 +458,4 @@ make check - Built for Red Hat Linux. * Fri Nov 23 2001 Tim Waugh -- Initial spec file. \ No newline at end of file +- Initial spec file. From a0bb6c58399feaf34fa0bbae3be03b0dda1d19a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:39:31 +0000 Subject: [PATCH 57/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index fce017b..6d7e131 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.28 -Release: 19%{?dist} +Release: 20%{?dist} License: GPLv2+ #Older versions up to xmlto-0.0.20 #URL: http://cyberelk.net/tim/xmlto/ @@ -88,6 +88,9 @@ make check %{_datadir}/xmlto/format/xhtml1/* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.0.28-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Nov 24 2022 Florian Weimer - 0.0.28-19 - Apply upstream patches to support building in stricer C99 mode From 6e464f7aa370ef6af6a527707e8948e5de43684f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:03:07 +0000 Subject: [PATCH 58/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index 6d7e131..d980035 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.28 -Release: 20%{?dist} +Release: 21%{?dist} License: GPLv2+ #Older versions up to xmlto-0.0.20 #URL: http://cyberelk.net/tim/xmlto/ @@ -88,6 +88,9 @@ make check %{_datadir}/xmlto/format/xhtml1/* %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.0.28-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 0.0.28-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From d19f7db1325201b4ea4129b9a8d32f012b65976a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sloup?= Date: Mon, 23 Oct 2023 23:24:42 +0200 Subject: [PATCH 59/69] Update license tag to the SPDX format (GPL-2.0-or-later) --- xmlto.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmlto.spec b/xmlto.spec index d980035..e99fdac 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -1,8 +1,8 @@ Summary: A tool for converting XML files to various formats Name: xmlto Version: 0.0.28 -Release: 21%{?dist} -License: GPLv2+ +Release: 22%{?dist} +License: GPL-2.0-or-later #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 @@ -88,6 +88,9 @@ make check %{_datadir}/xmlto/format/xhtml1/* %changelog +* Mon Oct 23 2023 Ondrej Sloup - 0.0.28-22 +- Update license tag to the SPDX format + * Sat Jul 22 2023 Fedora Release Engineering - 0.0.28-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From c3562b90a428c84cee5c0f58a17cc6769c294144 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:53:51 +0000 Subject: [PATCH 60/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index e99fdac..dbba208 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.28 -Release: 22%{?dist} +Release: 23%{?dist} License: GPL-2.0-or-later #Older versions up to xmlto-0.0.20 #URL: http://cyberelk.net/tim/xmlto/ @@ -88,6 +88,9 @@ make check %{_datadir}/xmlto/format/xhtml1/* %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.0.28-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Oct 23 2023 Ondrej Sloup - 0.0.28-22 - Update license tag to the SPDX format From 947717a290ad75ea4ff6e4c3bc3bbef213a353f1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:14:39 +0000 Subject: [PATCH 61/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index dbba208..2269a50 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.28 -Release: 23%{?dist} +Release: 24%{?dist} License: GPL-2.0-or-later #Older versions up to xmlto-0.0.20 #URL: http://cyberelk.net/tim/xmlto/ @@ -88,6 +88,9 @@ make check %{_datadir}/xmlto/format/xhtml1/* %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.0.28-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 0.0.28-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a64c58b3beed26da3899c22327be5c30980cae35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:58:07 +0200 Subject: [PATCH 62/69] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xmlto.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/xmlto.spec b/xmlto.spec index 2269a50..a62bc3c 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.28 -Release: 24%{?dist} +Release: 25%{?dist} License: GPL-2.0-or-later #Older versions up to xmlto-0.0.20 #URL: http://cyberelk.net/tim/xmlto/ @@ -28,7 +28,8 @@ This is a package for converting XML files to various formats using XSL stylesheets. %package tex -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later Summary: A set of xmlto backends with TeX requirements # For full functionality, we need passivetex. Requires: tex-passivetex @@ -41,7 +42,8 @@ This subpackage contains xmlto backend scripts which do require PassiveTeX/TeX for functionality. %package xhtml -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later Summary: A set of xmlto backends for xhtml1 source format # For functionality we need stylesheets xhtml2fo-style-xsl Requires: xhtml2fo-style-xsl @@ -88,6 +90,9 @@ make check %{_datadir}/xmlto/format/xhtml1/* %changelog +* Fri Jul 26 2024 Miroslav Suchý - 0.0.28-25 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 0.0.28-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From cb08ff9a604d5a9d4f25595a4a4df0141d706aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sloup?= Date: Tue, 30 Jul 2024 07:54:09 +0200 Subject: [PATCH 63/69] Rebase to the latest upstream version --- .gitignore | 1 + sources | 2 +- xmlto-c99-1.patch | 26 -------------------------- xmlto-c99-2.patch | 35 ----------------------------------- xmlto.spec | 27 ++++++++++++++------------- 5 files changed, 16 insertions(+), 75 deletions(-) delete mode 100644 xmlto-c99-1.patch delete mode 100644 xmlto-c99-2.patch diff --git a/.gitignore b/.gitignore index 1fd7dd1..96e7324 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ xmlto-0.0.23.tar.bz2 /xmlto-0.0.26.tar.bz2 /xmlto-0.0.27.tar.bz2 /xmlto-0.0.28.tar.bz2 +/xmlto-0.0.29.tar.gz diff --git a/sources b/sources index ffa6006..945ae00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -93bab48d446c826399d130d959fe676f xmlto-0.0.28.tar.bz2 +SHA512 (xmlto-0.0.29.tar.gz) = 95b574262b00c5d6460d156a1be6b0684ed2683f4ee0140016f7c88d8cdd7a46b4e090a9e55cee44b7ce88efb68da9af27ff02a182481d05486ed44bea0cc2ce diff --git a/xmlto-c99-1.patch b/xmlto-c99-1.patch deleted file mode 100644 index 8ba8416..0000000 --- a/xmlto-c99-1.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit 1375e2df75530cd198bd16ac3de38e2b0d126276 -Author: Thomas Kuehne -Date: Sat Dec 11 21:10:41 2021 +0100 - - fix -Wimplicit-int for ifsense - - fixes: - xmlif/xmlif.l:46:8: warning: type defaults to ‘int’ in declaration of ‘ifsense’ [-Wimplicit-int] - 46 | static ifsense; /* sense of last `if' or unless seen */ - | ^~~~~~~ - - Signed-off-by: Thomas Kuehne - -diff --git a/xmlif/xmlif.l b/xmlif/xmlif.l -index ac421367d47a2cd4..6e5970e147be21b1 100644 ---- a/xmlif/xmlif.l -+++ b/xmlif/xmlif.l -@@ -43,7 +43,7 @@ - - static char **selections; /* selection tokens */ - static int nselections; /* number of selections */ --static ifsense; /* sense of last `if' or unless seen */ -+static int ifsense; /* sense of last `if' or unless seen */ - static char *attribute; /* last attribute scanned */ - - struct stack_t { diff --git a/xmlto-c99-2.patch b/xmlto-c99-2.patch deleted file mode 100644 index 0bdd32f..0000000 --- a/xmlto-c99-2.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit 8e34f087bf410bcc5fe445933d6ad9bae54f24b5 -Author: Thomas Kuehne -Date: Sat Dec 11 21:54:50 2021 +0100 - - Fix return type of main function - - Fixes: - xmlif/xmlif.l:242:1: warning: return type defaults to ‘int’ [-Wimplicit-int] - 242 | main(int argc, char *argv[]) - | ^~~~ - - Signed-off-by: Thomas Kuehne - -diff --git a/xmlif/xmlif.l b/xmlif/xmlif.l -index 6e5970e147be21b1..8bcc59216d41a3cb 100644 ---- a/xmlif/xmlif.l -+++ b/xmlif/xmlif.l -@@ -239,7 +239,7 @@ WS [ \t\n]* - - int yywrap() {exit(0);}; - --main(int argc, char *argv[]) -+int main(int argc, char *argv[]) - { - int i; - -@@ -265,7 +265,7 @@ main(int argc, char *argv[]) - exit(1); - } - -- yylex(); -+ return yylex(); - } - - /* diff --git a/xmlto.spec b/xmlto.spec index a62bc3c..46c2dc7 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -1,21 +1,19 @@ -Summary: A tool for converting XML files to various formats Name: xmlto -Version: 0.0.28 -Release: 25%{?dist} +Version: 0.0.29 +Release: 1%{?dist} +Summary: A tool for converting XML files to various formats + License: GPL-2.0-or-later -#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://pagure.io/xmlto/ -Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2 -Patch0: xmlto-c99-1.patch -Patch1: xmlto-c99-2.patch +Source0: https://pagure.io/%{name}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: make BuildRequires: docbook-xsl BuildRequires: libxslt BuildRequires: util-linux, flex BuildRequires: gcc +BuildRequires: autoconf +BuildRequires: automake # We rely heavily on the DocBook XSL stylesheets! Requires: docbook-xsl @@ -28,7 +26,6 @@ This is a package for converting XML files to various formats using XSL stylesheets. %package tex -# Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later Summary: A set of xmlto backends with TeX requirements # For full functionality, we need passivetex. @@ -42,7 +39,6 @@ This subpackage contains xmlto backend scripts which do require PassiveTeX/TeX for functionality. %package xhtml -# Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later Summary: A set of xmlto backends for xhtml1 source format # For functionality we need stylesheets xhtml2fo-style-xsl @@ -56,7 +52,9 @@ This subpackage contains xmlto backend scripts for processing xhtml1 source format. %prep -%autosetup -p1 +%autosetup -n %{name}-%{version} -p1 + +autoreconf -i -v %build %configure BASH=/bin/bash @@ -70,7 +68,7 @@ make check %files %license COPYING -%doc ChangeLog README AUTHORS NEWS +%doc ChangeLog README.md AUTHORS.md NEWS.md %{_bindir}/* %{_mandir}/*/* %{_datadir}/xmlto @@ -90,6 +88,9 @@ make check %{_datadir}/xmlto/format/xhtml1/* %changelog +* Tue Jun 11 2024 Ondrej Sloup - 0.0.29-1 +- Rebase to the latest upstream version + * Fri Jul 26 2024 Miroslav Suchý - 0.0.28-25 - convert license to SPDX From b67fdf77ad0b5a2c538706460eabb09401db7352 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:02:42 +0000 Subject: [PATCH 64/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index 46c2dc7..47e5e81 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -1,6 +1,6 @@ Name: xmlto Version: 0.0.29 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A tool for converting XML files to various formats License: GPL-2.0-or-later @@ -88,6 +88,9 @@ make check %{_datadir}/xmlto/format/xhtml1/* %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.0.29-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Jun 11 2024 Ondrej Sloup - 0.0.29-1 - Rebase to the latest upstream version From a94a07b2d069769570fab1c99e69b2613a49e750 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:56:43 +0000 Subject: [PATCH 65/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index 47e5e81..1509bf1 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -1,6 +1,6 @@ Name: xmlto Version: 0.0.29 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A tool for converting XML files to various formats License: GPL-2.0-or-later @@ -88,6 +88,9 @@ make check %{_datadir}/xmlto/format/xhtml1/* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.0.29-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 0.0.29-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 8cb63c9ee2458dc07aa6e965f20904f7a9d431e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:46:24 +0000 Subject: [PATCH 66/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index 1509bf1..5cf1451 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -1,6 +1,6 @@ Name: xmlto Version: 0.0.29 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A tool for converting XML files to various formats License: GPL-2.0-or-later @@ -88,6 +88,9 @@ make check %{_datadir}/xmlto/format/xhtml1/* %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 0.0.29-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 0.0.29-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From e7ef05bd9aba1014ab5f74c2ca5932cffe565698 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Mon, 9 Feb 2026 10:53:56 -0500 Subject: [PATCH 67/69] fix -tex subpackage to use modern texlive provide --- xmlto.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmlto.spec b/xmlto.spec index 5cf1451..fa57349 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -1,6 +1,6 @@ Name: xmlto Version: 0.0.29 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A tool for converting XML files to various formats License: GPL-2.0-or-later @@ -29,7 +29,7 @@ stylesheets. License: GPL-2.0-or-later Summary: A set of xmlto backends with TeX requirements # For full functionality, we need passivetex. -Requires: tex-passivetex +Requires: texlive-passivetex # We require main package Requires: xmlto = %{version}-%{release} BuildArch: noarch @@ -88,6 +88,9 @@ make check %{_datadir}/xmlto/format/xhtml1/* %changelog +* Mon Feb 9 2026 Tom Callaway - 0.0.29-5 +- fix -tex subpackage to use modern texlive provide + * Sat Jan 17 2026 Fedora Release Engineering - 0.0.29-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From d68c111af153f2b263553adf9c18296e106d5098 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Mon, 9 Feb 2026 10:58:18 -0500 Subject: [PATCH 68/69] fix dates out of order error, may not be the exact date, but ... meh --- xmlto.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index fa57349..6902abc 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -100,7 +100,7 @@ make check * Sun Jan 19 2025 Fedora Release Engineering - 0.0.29-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild -* Tue Jun 11 2024 Ondrej Sloup - 0.0.29-1 +* Sun Aug 11 2024 Ondrej Sloup - 0.0.29-1 - Rebase to the latest upstream version * Fri Jul 26 2024 Miroslav Suchý - 0.0.28-25 From 4f6221779d7c37d73cac7e2216abb912bbd0f1fa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:19:11 +0000 Subject: [PATCH 69/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xmlto.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlto.spec b/xmlto.spec index 6902abc..416a773 100644 --- a/xmlto.spec +++ b/xmlto.spec @@ -1,6 +1,6 @@ Name: xmlto Version: 0.0.29 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A tool for converting XML files to various formats License: GPL-2.0-or-later @@ -88,6 +88,9 @@ make check %{_datadir}/xmlto/format/xhtml1/* %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 0.0.29-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Mon Feb 9 2026 Tom Callaway - 0.0.29-5 - fix -tex subpackage to use modern texlive provide