开源软件构建与测试

_service:tar_scm:ca-certificates.spec Changed

@@ -38,7 +38,7 @@
 Version: 2021.2.52
 # for Rawhide, please always use release >= 2
 # for Fedora release branches, please use release < 2 (1.0, 1.1, ...)
-Release: 1
+Release: 3
 License: Public Domain
 
 Group: System Environment/Base
@@ -170,12 +170,12 @@
 
 #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
+xsltproc --nonet -o %{name}/update-ca-trust.8 %{python3_sitelib}/asciidoc/resources/docbook-xsl/manpage.xsl %{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
+xsltproc --nonet -o %{name}/ca-legacy.8 %{python3_sitelib}/asciidoc/resources/docbook-xsl/manpage.xsl %{name}/ca-legacy.8.xml
 
 
 %install
@@ -307,9 +307,18 @@
 #if  $1 -gt 1  ; then
 #  # when upgrading or downgrading
 #fi
+# When coreutils is installing with ca-certificates
+# we need to wait until coreutils install to
+# run our update since update requires ln to complete.
+if  -x %{_bindir}/ln ; then
 %{_bindir}/ca-legacy install
 %{_bindir}/update-ca-trust
+fi
 
+%posttrans
+# we run the scripts here too, in case we couldn't run them in post
+%{_bindir}/ca-legacy install
+%{_bindir}/update-ca-trust
 
 %files
 %dir %{_sysconfdir}/ssl
@@ -370,6 +379,12 @@
 
 
 %changelog
+* Wed Mar 22 2023 wangjiang <wangjiang37@h-partners.com> - 2021.2.52-3
+- fix build fail due to asciidoc upgrade
+
+* Sat Oct 22 2022 wangjiang <wangjiang37@h-partners.com> - 2021.2.52-2
+- lagging install ca-legacy and update-ca-trust
+
 * Wed Dec 1 2021 liudabo <liudabo1@huawei.com> - 2021.2.52-1
 - upgrade version to 2021.2.52

_service Changed

_service:tar_scm:ca-certificates.yaml Changed

Changes of Revision 2