diff --git a/crypto-policies-git8b8e5af.tar.gz b/crypto-policies-git8b8e5af.tar.gz deleted file mode 100644 index ec38a80759d0295c9e4028d9edecde71cfe2a726..0000000000000000000000000000000000000000 Binary files a/crypto-policies-git8b8e5af.tar.gz and /dev/null differ diff --git a/crypto-policies-gita4c31a34.tar.gz b/crypto-policies-gita4c31a34.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8e711236507333a25b77da4e055eed1fdd93900f Binary files /dev/null and b/crypto-policies-gita4c31a34.tar.gz differ diff --git a/crypto-policies.spec b/crypto-policies.spec index 2f4d4e6f53f1b4d62b47cd211976938e5a63b909..13cf0f602fd0918f3c34b77e30248d81e5bdf686 100644 --- a/crypto-policies.spec +++ b/crypto-policies.spec @@ -1,14 +1,14 @@ -%define anolis_release 2 -%global git_date 20220314 -%global git_commit 8b8e5af4e37cd7d3b12396cd2a2f7487a700680f -%{?git_commit:%global git_commit_hash %(c=%{git_commit}; echo ${c:0:7})} +%define anolis_release 1 +%global git_date 20221215 +%global git_commit a4c31a34711325447363d87ba9fec5bb5535903a +%{?git_commit:%global git_commit_hash %(c=%{git_commit}; echo ${c:0:8})} Name: crypto-policies Version: %{git_date} Release: %{anolis_release}%{?dist} Summary: System-wide crypto policies -License: LGPLv2+ +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 @@ -30,6 +30,13 @@ BuildRequires: python3-flake8 BuildRequires: python3-coverage BuildRequires: codespell BuildRequires: make +BuildRequires: krb5-devel + +Conflicts: openssl-libs < 3.0.2-2 +Conflicts: nss < 3.44.0 +Conflicts: libreswan < 3.28 +Conflicts: openssh < 8.7p1-24 +Conflicts: gnutls < 3.7.3 %description This package provides pre-built configuration files with @@ -54,8 +61,16 @@ defined in simple policy definition files. The package also provides a tool fips-mode-setup, which can be used to enable or disable the system FIPS mode. +%package doc +Summary: Documentation files for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc +The %{name}-doc package contains documentation files for %{name} + %prep -%setup -q -n fedora-crypto-policies-%{git_commit} +%setup -q -n fedora-crypto-policies-%{git_commit_hash}-%{git_commit} %autopatch -p1 @@ -96,8 +111,7 @@ done %check make test %{?_smp_mflags} - - + %post -p if not posix.access("%{_sysconfdir}/crypto-policies/config") then local policy = "DEFAULT" @@ -128,11 +142,10 @@ if not posix.access("%{_sysconfdir}/crypto-policies/config") then end end end - + %posttrans scripts %{_bindir}/update-crypto-policies --no-check >/dev/null 2>/dev/null || : - %files %dir %{_sysconfdir}/crypto-policies/ %dir %{_sysconfdir}/crypto-policies/back-ends/ @@ -171,9 +184,6 @@ end %{_datarootdir}/crypto-policies/reload-cmds.sh %{_datarootdir}/crypto-policies/policies -%license COPYING.LESSER - - %license COPYING.LESSER %files scripts @@ -188,8 +198,13 @@ end %{_mandir}/man8/fips-mode-setup.8* %{_mandir}/man8/fips-finish-install.8* +%files doc +%doc ./doc/* README.md NEWS %changelog +* Mon Jan 09 2023 Xuchun Shang - 20221215-1 +- Update to version 20221215 + * Tue Nov 01 2022 mgb01105731 - 20220314-2 - optimise spec file