From 58fa46c0555b78edd3f149e30dad40a1194b13e8 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 26 Jun 2023 17:07:05 -0400 Subject: [PATCH] Adapt to asciidoc 10 changes Related: RHEL-44988 asciidoc 10 includes a number of packaging changes, including the removal of asciidoc.py aliases and the relocation of resources. Instead of trying to manage the latter in a compatible way, use xmlto instead for the xml-to-man conversion. --- ca-certificates.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ca-certificates.spec b/ca-certificates.spec index 3897e33..1f7aebb 100644 --- a/ca-certificates.spec +++ b/ca-certificates.spec @@ -80,7 +80,7 @@ BuildRequires: perl-interpreter BuildRequires: python3 BuildRequires: openssl BuildRequires: asciidoc -BuildRequires: libxslt +BuildRequires: xmlto %description This package contains the set of CA certificates chosen by the @@ -169,12 +169,12 @@ popd #manpage cp %{SOURCE10} %{name}/update-ca-trust.8.txt -asciidoc.py -v -d manpage -b docbook %{name}/update-ca-trust.8.txt -xsltproc --nonet -o %{name}/update-ca-trust.8 /usr/share/asciidoc/docbook-xsl/manpage.xsl %{name}/update-ca-trust.8.xml +asciidoc -v -d manpage -b docbook %{name}/update-ca-trust.8.txt +xmlto -v -o %{name} man %{name}/update-ca-trust.8.xml cp %{SOURCE9} %{name}/ca-legacy.8.txt -asciidoc.py -v -d manpage -b docbook %{name}/ca-legacy.8.txt -xsltproc --nonet -o %{name}/ca-legacy.8 /usr/share/asciidoc/docbook-xsl/manpage.xsl %{name}/ca-legacy.8.xml +asciidoc -v -d manpage -b docbook %{name}/ca-legacy.8.txt +xmlto -v -o %{name} man %{name}/ca-legacy.8.xml %install