Compare commits

...

3 Commits

Author SHA1 Message Date
Alexander Sosedkin 90afd98cae Build only on %java_arches: limit to RHEL-10+ / ELN 2024-02-02 01:25:34 +00:00
Yaakov Selkowitz 6d56296060 Build only on %java_arches
While the resulting RPM is noarch, this package uses java-devel for
testing purposes, and therefore can only be built on java-enabled arches.
This prevents the build from landing on an i686 builder and failing.
2023-12-14 12:11:49 -05:00
Clemens Lang f92ae4b1f8 Update from upstream (fips-mode-setup /boot == /, empty /boot)
- fips-mode-setup: Fix test for empty /boot (RHEL-11350)
- fips-mode-setup: Avoid 'boot=UUID=' if /boot == / (RHEL-11350)

Resolves: RHEL-11350
2023-11-13 13:05:37 +01:00
3 changed files with 11 additions and 3 deletions

View File

@ -0,0 +1 @@
0ac1d8a0b7b462259a9110bb01af6eb2c6f56be9 crypto-policies-gite9247c2.tar.gz

View File

@ -1,5 +1,5 @@
%global git_date 20231109
%global git_commit 0ceff7facb8c156a612e5be7619bbe902d12eae6
%global git_date 20231113
%global git_commit e9247c2b86669a983824300002a0f8fc9e8ce333
%{?git_commit:%global git_commit_hash %(c=%{git_commit}; echo ${c:0:7})}
%global _python_bytecompile_extra 0
@ -36,6 +36,9 @@ URL: https://gitlab.com/redhat-crypto/fedora-crypto-policies
# For RHEL-9 we use the upstream branch rhel9.
Source0: https://gitlab.com/redhat-crypto/fedora-crypto-policies/-/archive/%{git_commit_hash}/%{name}-git%{git_commit_hash}.tar.gz
%if 0%{?rhel} >= 10
ExclusiveArch: %{java_arches} noarch
%endif
BuildArch: noarch
BuildRequires: asciidoc
BuildRequires: libxslt
@ -238,6 +241,10 @@ end
%{_mandir}/man8/fips-finish-install.8*
%changelog
* Mon Nov 13 2023 Clemens Lang <cllang@redhat.com> - 20231113-1.gite9247c2
- fips-mode-setup: Fix test for empty /boot (RHEL-11350)
- fips-mode-setup: Avoid 'boot=UUID=' if /boot == / (RHEL-11350)
* Thu Nov 09 2023 Clemens Lang <cllang@redhat.com> - 20231109-1.git0ceff7f
- Restore support for scoped ssh_etm directives (RHEL-15925)
- Print matches in syntax deprecation warnings (RHEL-15925)

View File

@ -1 +1 @@
SHA512 (crypto-policies-git0ceff7f.tar.gz) = 78b9b5630c3727deebb8e87de1ac05b57914041e96e6ed074606286525c6c73bf26a77db82dd3fdda863336ed1930a8352a8f7df7cabe5d3fcd22d21da87b108
SHA512 (crypto-policies-gite9247c2.tar.gz) = 0d3468861a7d4bce144ac700fec22ab0eab90c07056c86113a1786158dd65bb16eb5e80a16112deb566d7f0a5409a50a908b0aa8e4ebf609129c43a0dd725dfb