dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-29 15:58:00 +00:00 · 2009-11-26 01:34:32 +00:00 · 2009-03-02 17:21:43 +00:00 · 2009-02-02 12:32:22 +00:00 · 2008-05-13 10:16:58 +00:00 · 2008-04-22 02:59:39 +00:00
6 changed files with 97 additions and 282 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1 @@
-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
-/xmlto-0.0.28.tar.bz2
-/xmlto-0.0.29.tar.gz
+xmlto-0.0.20.tar.bz2
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (xmlto-0.0.29.tar.gz) = 95b574262b00c5d6460d156a1be6b0684ed2683f4ee0140016f7c88d8cdd7a46b4e090a9e55cee44b7ce88efb68da9af27ff02a182481d05486ed44bea0cc2ce
+ab814ae352fc028862cbea9d676ab93b  xmlto-0.0.20.tar.bz2
--- a/xmlto-backendstylesheet.patch
+++ b/xmlto-backendstylesheet.patch
@ -0,0 +1,11 @@
+diff -urNp xmlto-0.0.20-orig/xmlto.in xmlto-0.0.20/xmlto.in
+--- xmlto-0.0.20-orig/xmlto.in	2008-01-17 10:39:02.000000000 +0100
+++ xmlto-0.0.20/xmlto.in	2008-05-13 12:08:35.000000000 +0200
+@@ -326,6 +326,7 @@ fi
+ # Ask the format script what stylesheet to use.
+ XSLT_PROCESSOR=xsltproc # We only know about xsltproc right now.
+ export XSLT_PROCESSOR
+export USE_BACKEND
+ if [ -z "$STYLESHEET" ]
+ then
+   STYLESHEET="$(${BASH} "$FORMAT" stylesheet)" || exit 1
--- a/xmlto-stringparam.patch
+++ b/xmlto-stringparam.patch
@ -0,0 +1,23 @@
+diff -urNp xmlto-0.0.20-orig/THANKS xmlto-0.0.20/THANKS
+--- xmlto-0.0.20-orig/THANKS	2008-01-15 13:56:45.000000000 +0100
+++ xmlto-0.0.20/THANKS	2009-02-02 13:03:10.000000000 +0100
+@@ -9,3 +9,4 @@ Tommy Reynolds <tommy.reynolds@megacoder
+ Coleman Kane <cokane@cokane.org>
+ Shlomi Fish <shlomif@gmail.com>
+ Braden McDaniel <braden@endoframe.com>
+Joseph Parmelee <jparmele@wildbear.com>
+diff -urNp xmlto-0.0.20-orig/xmlto.in xmlto-0.0.20/xmlto.in
+--- xmlto-0.0.20-orig/xmlto.in	2009-02-02 13:00:17.000000000 +0100
+++ xmlto-0.0.20/xmlto.in	2009-02-02 13:02:41.000000000 +0100
+@@ -241,8 +241,8 @@ while [ "$#" -gt "0" ]; do
+ 	;;
+   --stringparam)
+ 	MYPARAM="$2"
+-	XSLTPARAMS="XSLTPARAMS --stringparam ${MYPARAM%=*}"
+-	XSLTPARAMS="XSLTPARAMS $MYPARAM#*=}"
+	XSLTPARAMS="$XSLTPARAMS --stringparam ${MYPARAM%=*}"
+	XSLTPARAMS="$XSLTPARAMS ${MYPARAM#*=}"
+ 	shift 2
+ 	;;
+   --noclean)
+Binární soubory xmlto-0.0.20-orig/.xmlto.in.swp a xmlto-0.0.20/.xmlto.in.swp jsou různé
--- a/xmlto-xmllintoptions.patch
+++ b/xmlto-xmllintoptions.patch
@ -0,0 +1,15 @@
+diff -urNp xmlto-0.0.20-orig/xmlto.in xmlto-0.0.20/xmlto.in
+--- xmlto-0.0.20-orig/xmlto.in	2009-02-02 13:23:06.000000000 +0100
+++ xmlto-0.0.20/xmlto.in	2009-02-02 13:27:50.000000000 +0100
+@@ -372,8 +372,9 @@ if [ "$SKIP_VALIDATION" -eq 0 ] && [ "$S
+ then
+   VALIDATION="${XSLT_PROCESSED_DIR}/validation-errors"
+   [ "$VERBOSE" -ge 1 ] && \
+-    echo >&2 "xmllint >/dev/null --xinclude --postvalid \"$INPUT_FILE\""
+-  xmllint >/dev/null --xinclude --postvalid "$INPUT_FILE" 2>"${VALIDATION}"
+    echo >&2 "xmllint >/dev/null --xinclude --postvalid --noent \"$INPUT_FILE\""
+  xmllint >/dev/null --xinclude --postvalid --noent \
+    "$INPUT_FILE" 2>"${VALIDATION}"
+   xmllint_status=$?
+   if [ $xmllint_status -ne 0 ]
+   then
--- a/xmlto.spec
+++ b/xmlto.spec
@ -1,22 +1,35 @@
-Name: xmlto
-Version: 0.0.29
-Release: 6%{?dist}
+%{!?tetex:%define tetex 1}
+
 Summary: A tool for converting XML files to various formats
+Name: xmlto
+Version: 0.0.20
+Release: 5%{?dist}
+#xmlto is released under GPLv2+ license, xmlif under GPL+ license
+License: GPLv2+ and GPL+
+Group: Applications/System
+#Newer versions above xmlto-0.0.20 at https://fedorahosted.org/xmlto/
+URL: http://cyberelk.net/tim/xmlto/
+Source0: http://cyberelk.net/tim/data/xmlto/stable/%{name}-%{version}.tar.bz2

-License: GPL-2.0-or-later
-URL: https://pagure.io/xmlto/
-Source0: https://pagure.io/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
+Patch1: xmlto-backendstylesheet.patch
+Patch2: xmlto-stringparam.patch
+#Patch3: xmlto-xmllintoptions.patch

-BuildRequires: make
-BuildRequires: docbook-xsl
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: docbook-xsl >= 1.56.0
 BuildRequires: libxslt
 BuildRequires: util-linux, flex
-BuildRequires: gcc
-BuildRequires: autoconf
-BuildRequires: automake

 # We rely heavily on the DocBook XSL stylesheets!
-Requires: docbook-xsl
+Requires: docbook-xsl >= 1.56.0
+
+Requires: text-www-browser
+
+# For full functionality, we need passivetex.
+%if %{tetex}
+Requires: passivetex >= 1.11
+%endif
 Requires: libxslt
 Requires: docbook-dtds
 Requires: util-linux, flex
@ -25,283 +38,42 @@ Requires: util-linux, flex
 This is a package for converting XML files to various formats using XSL
 stylesheets.

-%package tex
-License: GPL-2.0-or-later
-Summary: A set of xmlto backends with TeX requirements
-# For full functionality, we need passivetex.
-Requires: texlive-passivetex
-# We require main package
-Requires: xmlto = %{version}-%{release}
-BuildArch: noarch
-
-%description tex
-This subpackage contains xmlto backend scripts which do require
-PassiveTeX/TeX for functionality.
-
-%package xhtml
-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
-# We require main package
-Requires: xmlto = %{version}-%{release}
-BuildArch: noarch
-
-%description xhtml
-This subpackage contains xmlto backend scripts for processing
-xhtml1 source format.
-
 %prep
-%autosetup -n %{name}-%{version} -p1
-
-autoreconf -i -v
+%setup -q
+%patch1 -p1 -b .backendstylesheet
+%patch2 -p1 -b .stringparam
+#%patch3 -p1 -b .xmllintoptions

 %build
-%configure BASH=/bin/bash
-%make_build
+touch doc/xmlto.xml doc/xmlif.xml
+%configure
+make %{?_smp_mflags}

 %check
 make check

 %install
-%make_install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT

 %files
-%license COPYING
-%doc ChangeLog README.md AUTHORS.md NEWS.md
+%defattr(-,root,root,-)
+%doc COPYING ChangeLog README AUTHORS NEWS
 %{_bindir}/*
 %{_mandir}/*/*
 %{_datadir}/xmlto
-%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
-%{_datadir}/xmlto/format/fo/dvi
-%{_datadir}/xmlto/format/fo/ps
-%{_datadir}/xmlto/format/fo/pdf
-
-%files xhtml
-%dir %{_datadir}/xmlto/format/xhtml1/
-%{_datadir}/xmlto/format/xhtml1/*

 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.29-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+* Mon Mar 02 2009 Ondrej Vasik <ovasik@redhat.com> - 0.0.20-5
+- temporarily revert xmllint noent change (#488093)

-* Mon Feb  9 2026 Tom Callaway <spot@fedoraproject.org> - 0.0.29-5
- fix -tex subpackage to use modern texlive provide
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.29-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.29-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.29-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sun Aug 11 2024 Ondrej Sloup <osloup@redhat.com> - 0.0.29-1
- Rebase to the latest upstream version
-
-* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 0.0.28-25
- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.28-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.28-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Oct 23 2023 Ondrej Sloup <osloup@redhat.com> - 0.0.28-22
- Update license tag to the SPDX format
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.28-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.28-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Nov 24 2022 Florian Weimer <fweimer@redhat.com> - 0.0.28-19
- Apply upstream patches to support building in stricer C99 mode
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.28-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.28-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.28-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.28-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.28-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.28-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.28-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.28-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 21 2018 Ondrej Vasik <ovasik@redhat.com> - 0.0.28-10
- add BuildRequires for gcc (#1606744)
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.28-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jul 03 2018 Than Ngo <than@redhat.com> - 0.0.28-8
- use the passivetex from texlive
-
-* Mon Jul 02 2018 Ondrej Vasik <ovasik@redhat.com> - 0.0.28-7
- upstream moved to pagure.io/xmlto (#1502443)
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.28-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.28-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.28-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.28-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.28-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Nov 18 2015 Ondrej Vasik <ovasik@redhat.com> 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 <ovasik@redhat.com> 0.0.27-1
- 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 <rel-eng@lists.fedoraproject.org> - 0.0.26-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.26-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.26-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Apr 05 2014 Ondrej Vasik <ovasik@redhat.com> - 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 <rel-eng@lists.fedoraproject.org> - 0.0.25-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Tue Apr 09 2013 Ondrej Vasik <ovasik@redhat.com> - 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 <rel-eng@lists.fedoraproject.org> - 0.0.25-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.25-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jun 08 2012 Ondrej Vasik <ovasik@redhat.com> - 0.0.25-3
- fix the noextensions option (#830266)
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.25-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Fri Dec 02 2011 Ondrej Vasik <ovasik@redhat.com> - 0.0.25-1
- fix handling of external data objects with fop
-  (deb #568894)
-
-* Tue Nov 29 2011 Ondrej Vasik <ovasik@redhat.com> - 0.0.24-2
- fix the functionality of fop.extensions (#757035)
-
-* Thu Jul 14 2011 Ondrej Vasik <ovasik@redhat.com> - 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 <rel-eng@lists.fedoraproject.org> - 0.0.23-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Oct 13 2009 Ondrej Vasik <ovasik@redhat.com> - 0.0.23-3
- workaround passivetex limitation for chapter titles starting
-  with L(#526273)
-
-* Thu Sep 24 2009 Ondrej Vasik <ovasik@redhat.com> - 0.0.23-2
- ensure the default shell is /bin/bash instead of /bin/sh
-
-* Mon Sep 21 2009 Ondrej Vasik <ovasik@redhat.com> - 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 <ovasik@redhat.com> - 0.0.22-3
- make subpackages noarch, preserve timestamps - merge
-  review (#226568)
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.22-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Mar 25 2009 Ondrej Vasik <ovasik@redhat.com> - 0.0.22-1
- New version 0.0.22
- autodetection for tools/program paths, consolidated
-  error code handling, build warnings cleanup
-
-* Mon Mar 16 2009 Ondrej Vasik <ovasik@redhat.com> - 0.0.21-9
- reenable noent switch - bug is on lcdproc side
- add xhtml support(subpackage) (#145140)
-
-* Mon Mar 02 2009 Ondrej Vasik <ovasik@redhat.com> - 0.0.21-8
- temporarily disable noent switch - blocks lcdproc doc build
-  (#488093)
-
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.21-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Jan 28 2009 Ondrej Vasik <ovasik@redhat.com> - 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 <ovasik@redhat.com> - 0.0.21-5
+* Mon Feb 02 2009 Ondrej Vasik <ovasik@redhat.com> - 0.0.20-4
+- fix xmllint postvalid (added noent option)
 - fix stringparam option functionality
-
-* Tue Dec 16 2008 Ondrej Vasik <ovasik@redhat.com> - 0.0.21-4
- merge review(#226568)
-  correct doc filelist attributes, add License GPL+ for xmlif
-
-* Fri Dec 12 2008 Ondrej Vasik <ovasik@redhat.com> - 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 <ovasik@redhat.com> - 0.0.21-2
- xmlto-tex subpackage to prevent requirements for
-  passivetex/tex for all backends(#454341)
-
-* Fri Jun 20 2008 Ondrej Vasik <ovasik@redhat.com> - 0.0.21-1
- new version 0.0.21
+- ship documentation files, spec file cleanup

 * Tue May 13 2008 Ondrej Vasik <ovasik@redhat.com> - 0.0.20-3
 - fixed errorneus handling of backend stylesheet(#446092)
Author	SHA1	Message	Date
Fedora Release Engineering	e5e4ebff9e	dist-git conversion	2010-07-29 15:58:00 +00:00
Bill Nottingham	49ddd9ea01	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:34:32 +00:00
Ondrej Vasik	d6ff1841e2	temporarily revert xmllint noent change (#488093 )	2009-03-02 17:21:43 +00:00
Ondrej Vasik	310a2403f1	fix xmllint postvalid (added noent option), fix stringparam option functionality, ship documentation files, spec file cleanup	2009-02-02 12:32:22 +00:00
Ondrej Vasik	580469bf8a	fixed errorneus handling of backend stylesheet(#446092 )	2008-05-13 10:16:58 +00:00
Jesse Keating	cf8acc660a	Initialize branch F-9 for xmlto	2008-04-22 02:59:39 +00:00