Compare commits

..

No commits in common. "c8" and "c9-beta" have entirely different histories.
c8 ... c9-beta

View File

@ -1,7 +1,6 @@
Name: docbook-style-xsl Name: docbook-style-xsl
Version: 1.79.2 Version: 1.79.2
Release: 9%{?dist} Release: 16%{?dist}
Group: Applications/Text
Summary: Norman Walsh's XSL stylesheets for DocBook XML Summary: Norman Walsh's XSL stylesheets for DocBook XML
@ -17,8 +16,8 @@ Requires(post): libxml2 >= 2.4.8
Requires(postun): libxml2 >= 2.4.8 Requires(postun): libxml2 >= 2.4.8
# PassiveTeX before 1.21 can't handle the newer stylesheets. # PassiveTeX before 1.21 can't handle the newer stylesheets.
Conflicts: passivetex < 1.21 Conflicts: passivetex < 1.21
BuildRequires: make
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch BuildArch: noarch
Source0: https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F{%version}/docbook-xsl-nons-%{version}.tar.bz2 Source0: https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F{%version}/docbook-xsl-nons-%{version}.tar.bz2
@ -40,7 +39,8 @@ Patch5: docbook-xsl-list-item-body.patch
Patch6: docbook-xsl-mandir.patch Patch6: docbook-xsl-mandir.patch
#Non-recursive string.subst that doesn't kill smb.conf.5 generation #Non-recursive string.subst that doesn't kill smb.conf.5 generation
Patch7: docbook-style-xsl-non-recursive-string-subst.patch Patch7: docbook-style-xsl-non-recursive-string-subst.patch
#Fix generate consistent IDs so it doesn't cause multilib conflicts (#1761964) #Fix multilib problems with gtk-doc documentation
#https://github.com/docbook/xslt10-stylesheets/issues/54
Patch8: docbook-style-xsl-1.79.2-fix-gtk-doc-multilib.patch Patch8: docbook-style-xsl-1.79.2-fix-gtk-doc-multilib.patch
%description %description
@ -62,7 +62,7 @@ popd
%patch5 -p1 -b .listitembody %patch5 -p1 -b .listitembody
%patch6 -p1 -b .mandir %patch6 -p1 -b .mandir
%patch7 -p2 -b .non-recursive-subst %patch7 -p2 -b .non-recursive-subst
%patch8 -p1 -b .genconstids %patch8 -p1 -b .gtk-doc-multilib
cp -p %{SOURCE1} Makefile cp -p %{SOURCE1} Makefile
@ -95,12 +95,7 @@ ln -s xsl-stylesheets-%{version} \
rm -rf $DESTDIR%{_datadir}/sgml/docbook/xsl-stylesheets/extensions/* rm -rf $DESTDIR%{_datadir}/sgml/docbook/xsl-stylesheets/extensions/*
%clean
DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT
%files %files
%defattr (-,root,root,-)
%doc BUGS %doc BUGS
%doc README %doc README
%doc TODO %doc TODO
@ -142,8 +137,33 @@ if [ "$1" = 0 ]; then
fi fi
%changelog %changelog
* Wed Jan 20 2021 Ondrej Vasik <ovasik@redhat.com> - 1.79.2-9 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.79.2-16
- fix generate consistent IDs issue (#1761964) - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.79.2-15
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Jan 15 2021 David King <amigadave@amigadave.com> - 1.79.2-13
- Fix gtk-doc multilib failures
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-7 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@ -537,7 +557,7 @@ fi
* Tue Jun 26 2001 Chris Runge <crunge@pobox.com> * Tue Jun 26 2001 Chris Runge <crunge@pobox.com>
- 1.40 - 1.40
* Fri Jun 09 2001 Chris Runge <crunge@pobox.com> * Sat Jun 09 2001 Chris Runge <crunge@pobox.com>
- added extensions and additional doc - added extensions and additional doc
- bin added to doc; the Perl files are for Win32 Perl and so need some - bin added to doc; the Perl files are for Win32 Perl and so need some
conversion first conversion first