diff --git a/crypto-policies.spec b/crypto-policies.spec index 2e19a658c2a5e804e1fc4b4c51babbf3235fa89a..100679219579c0459c6fb3c4a53a1828ca5a4c6a 100644 --- a/crypto-policies.spec +++ b/crypto-policies.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 3 %global git_date 20221215 %global git_commit a4c31a34711325447363d87ba9fec5bb5535903a %{?git_commit:%global git_commit_hash %(c=%{git_commit}; echo ${c:0:7})} @@ -14,6 +14,8 @@ License: LGPLv2.1+ URL: https://gitlab.com/redhat-crypto/fedora-crypto-policies Source0: https://gitlab.com/redhat-crypto/fedora-crypto-policies/-/archive/%{git_commit_hash}/%{name}-git%{git_commit_hash}.tar.gz +Patch1: update-for-asciidoc-10.patch + BuildArch: noarch BuildRequires: asciidoc BuildRequires: libxslt @@ -30,6 +32,7 @@ BuildRequires: python3-pytest BuildRequires: python3-pylint BuildRequires: python3-flake8 BuildRequires: python3-coverage +BuildRequires: python3-platformdirs BuildRequires: codespell BuildRequires: make BuildRequires: krb5-devel @@ -76,8 +79,7 @@ BuildArch: noarch The %{name}-doc package contains documentation files for %{name}. %prep -%setup -q -n fedora-crypto-policies-%{git_commit_hash}-%{git_commit} -%autopatch -p1 +%autosetup -n fedora-crypto-policies-%{git_commit_hash}-%{git_commit} -p1 %build @@ -215,6 +217,9 @@ end %doc NEWS README.md CONTRIBUTING.md %changelog +* Wed Mar 22 2023 happy_orange - 20221215-3 +- fix the build error beacuse of asciidoc update to 10.x.x + * Thu Feb 02 2023 happy_orange - 20221215-2 - change the version of conflict package openssh diff --git a/update-for-asciidoc-10.patch b/update-for-asciidoc-10.patch new file mode 100644 index 0000000000000000000000000000000000000000..6f0df57868c0f6ef909a6bf00563fd6b9bfcaa3a --- /dev/null +++ b/update-for-asciidoc-10.patch @@ -0,0 +1,39 @@ +From 8c7de0471c1de088ff3c332590ea91a71d4273c0 Mon Sep 17 00:00:00 2001 +From: Alexander Sosedkin +Date: Mon, 20 Feb 2023 11:39:28 +0100 +Subject: [PATCH] Makefile: update for asciidoc 10 + +--- + Makefile | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index f99dc6d..e99ca19 100644 +--- a/Makefile ++++ b/Makefile +@@ -10,7 +10,12 @@ SCRIPTS=update-crypto-policies fips-finish-install fips-mode-setup + NUM_PROCS = $$(getconf _NPROCESSORS_ONLN) + PYVERSION = -3 + DIFFTOOL?=meld +-ASCIIDOC?=asciidoc.py ++ASCIIDOC?=asciidoc ++ifneq ("$(wildcard /usr/lib/python*/*/asciidoc/resources/docbook-xsl/manpage.xsl)","") ++MANPAGEXSL?=$(wildcard /usr/lib/python*/*/asciidoc/resources/docbook-xsl/manpage.xsl) ++else ++MANPAGEXSL?=/usr/share/asciidoc/docbook-xsl/manpage.xsl ++endif + + all: build + +@@ -111,7 +116,7 @@ clean: + + %: %.txt + $(ASCIIDOC) -v -d manpage -b docbook $< +- xsltproc --nonet -o $@ /usr/share/asciidoc/docbook-xsl/manpage.xsl $@.xml ++ xsltproc --nonet -o $@ ${MANPAGEXSL} $@.xml + + dist: + rm -rf crypto-policies && git clone . crypto-policies && rm -rf crypto-policies/.git/ && tar -czf crypto-policies-git$(VERSION).tar.gz crypto-policies && rm -rf crypto-policies +-- +GitLab +