Compare commits
No commits in common. "c10s" and "c8" have entirely different histories.
7
.gitignore
vendored
7
.gitignore
vendored
@ -1,6 +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
|
||||
SOURCES/xmlto-0.0.28.tar.bz2
|
||||
|
1
.xmlto.metadata
Normal file
1
.xmlto.metadata
Normal file
@ -0,0 +1 @@
|
||||
aa63af9a86ab6ed0c92ea8b177dc808c18902c73 SOURCES/xmlto-0.0.28.tar.bz2
|
@ -1,21 +1,19 @@
|
||||
Summary: A tool for converting XML files to various formats
|
||||
Name: xmlto
|
||||
Version: 0.0.28
|
||||
Release: 24%{?dist}
|
||||
License: GPL-2.0-or-later
|
||||
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://pagure.io/xmlto/
|
||||
Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
|
||||
Patch0: xmlto-c99-1.patch
|
||||
Patch1: xmlto-c99-2.patch
|
||||
Source0: http://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
|
||||
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: docbook-xsl
|
||||
BuildRequires: libxslt
|
||||
BuildRequires: util-linux, flex
|
||||
BuildRequires: gcc
|
||||
|
||||
# We rely heavily on the DocBook XSL stylesheets!
|
||||
Requires: docbook-xsl
|
||||
@ -28,20 +26,23 @@ This is a package for converting XML files to various formats using XSL
|
||||
stylesheets.
|
||||
|
||||
%package tex
|
||||
License: GPL-2.0-or-later
|
||||
Group: Applications/System
|
||||
License: GPLv2+
|
||||
Summary: A set of xmlto backends with TeX requirements
|
||||
# For full functionality, we need passivetex.
|
||||
Requires: tex-passivetex
|
||||
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
|
||||
PassiveTeX/TeX for functionality.
|
||||
|
||||
%package xhtml
|
||||
License: GPL-2.0-or-later
|
||||
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
|
||||
@ -54,21 +55,22 @@ This subpackage contains xmlto backend scripts for processing
|
||||
xhtml1 source format.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%setup -q
|
||||
|
||||
%build
|
||||
%configure BASH=/bin/bash
|
||||
%make_build
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%check
|
||||
make check
|
||||
|
||||
%install
|
||||
%make_install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc ChangeLog README AUTHORS NEWS
|
||||
%defattr(-,root,root,-)
|
||||
%doc COPYING ChangeLog README AUTHORS NEWS
|
||||
%{_bindir}/*
|
||||
%{_mandir}/*/*
|
||||
%{_datadir}/xmlto
|
||||
@ -78,67 +80,20 @@ make check
|
||||
%exclude %dir %{_datadir}/xmlto/format/xhtml1/
|
||||
%exclude %{_datadir}/xmlto/format/xhtml1
|
||||
|
||||
|
||||
%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/*
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.0.28-24
|
||||
- Bump release for June 2024 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)
|
||||
|
||||
@ -178,7 +133,7 @@ make check
|
||||
* 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
|
||||
* Sat Apr 04 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
|
||||
@ -222,7 +177,7 @@ make check
|
||||
- workaround passivetex limitation for chapter titles starting
|
||||
with L(#526273)
|
||||
|
||||
* Thu Sep 24 2009 Ondrej Vasik <ovasik@redhat.com> - 0.0.23-2
|
||||
* Fri 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
|
||||
@ -279,7 +234,7 @@ make check
|
||||
- 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
|
||||
* Mon Jun 20 2008 Ondrej Vasik <ovasik@redhat.com> - 0.0.21-1
|
||||
- new version 0.0.21
|
||||
|
||||
* Tue May 13 2008 Ondrej Vasik <ovasik@redhat.com> - 0.0.20-3
|
@ -1,26 +0,0 @@
|
||||
commit 1375e2df75530cd198bd16ac3de38e2b0d126276
|
||||
Author: Thomas Kuehne <thomas@kuehne.cn>
|
||||
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 <thomas@kuehne.cn>
|
||||
|
||||
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 {
|
@ -1,35 +0,0 @@
|
||||
commit 8e34f087bf410bcc5fe445933d6ad9bae54f24b5
|
||||
Author: Thomas Kuehne <thomas@kuehne.cn>
|
||||
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 <thomas@kuehne.cn>
|
||||
|
||||
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();
|
||||
}
|
||||
|
||||
/*
|
Loading…
Reference in New Issue
Block a user