From bd9ef9d20d6931317c68902922b9575f83dbc655 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:10:19 +0000 Subject: [PATCH 01/39] - 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 02/39] 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 03/39] 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 04/39] 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 05/39] - 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 06/39] - 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 07/39] - 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 08/39] - 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 09/39] - 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 10/39] 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 11/39] 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 12/39] 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 13/39] - 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 14/39] 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 15/39] 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 16/39] - 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 17/39] - 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 18/39] - 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 19/39] - 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 20/39] 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 21/39] 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 22/39] - 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 23/39] - 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 24/39] - 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 25/39] 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 26/39] 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 27/39] 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 28/39] 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 29/39] 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 30/39] 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 31/39] 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 32/39] 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 33/39] 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 34/39] 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 35/39] 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 36/39] 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 37/39] 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 38/39] 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 39/39] 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