Update to 116

Resolves: RHEL-32133
This commit is contained in:
imagebuilder-bot 2024-08-15 15:04:54 +00:00 committed by Tomáš Hozza
parent 56d59c1819
commit 981fa52d63
No known key found for this signature in database
GPG Key ID: C5887AD51D9F3C2D
4 changed files with 17 additions and 6 deletions

1
.gitignore vendored
View File

@ -96,3 +96,4 @@
/osbuild-composer-113.tar.gz
/osbuild-composer-114.tar.gz
/osbuild-composer-115.tar.gz
/osbuild-composer-116.tar.gz

View File

@ -8,11 +8,11 @@
%bcond_with relax_requires
# The minimum required osbuild version
%global min_osbuild_version 116
%global min_osbuild_version 120
%global goipath github.com/osbuild/osbuild-composer
Version: 115
Version: 116
%gometa
@ -172,7 +172,9 @@ install -m 0644 -vp repositories/centos-stream-%{centos}* %{buildroot}%
%if 0%{?rhel}
# RHEL 10 supports building all RHEL versions
%if 0%{?rhel} >= 10
install -m 0644 -vp repositories/rhel-* %{buildroot}%{_datadir}/osbuild-composer/repositories/
for REPO_FILE in $(ls repositories/rhel-* | grep -v 'no-aux-key'); do
install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE})
done
# RHEL-8 auxiliary key is signed using SHA-1, which is not enabled by default on RHEL-10 and later
for REPO_FILE in $(ls repositories/rhel-8*-no-aux-key.json); do
@ -181,11 +183,15 @@ done
%else
# All other RHEL versions support building for the same version
install -m 0644 -vp repositories/rhel-%{rhel}* %{buildroot}%{_datadir}/osbuild-composer/repositories/
for REPO_FILE in $(ls repositories/rhel-%{rhel}* | grep -v 'no-aux-key'); do
install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE})
done
# RHEL 9 supports building also for RHEL 8
%if 0%{?rhel} == 9
install -m 0644 -vp repositories/rhel-8* %{buildroot}%{_datadir}/osbuild-composer/repositories/
for REPO_FILE in $(ls repositories/rhel-8* | grep -v 'no-aux-key'); do
install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE})
done
%endif
%endif
@ -446,6 +452,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif
%changelog
* Thu Aug 15 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 116-1
- New upstream release
* Wed Aug 07 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 115-1
- New upstream release

View File

@ -2,6 +2,7 @@ summary: Run unit tests from source
discover:
how: fmf
dist-git-source: true
dist-git-remove-fmf-root: true
filter: tag:unit-test
execute:
how: tmt

View File

@ -1 +1 @@
SHA512 (osbuild-composer-115.tar.gz) = a71a7a6fd479411f35424c95d4f826c4a5574595f61173301483fef1f6c035adbc4ed2222fca0d00a5de51c9c9c60b7af0c94177adead1600a486ccd9a8dfce7
SHA512 (osbuild-composer-116.tar.gz) = ba4b1b78742943e9e69d20e3348053bc5821a0446782b1b6a950ce6d8d6ba30f242d69fc28d87d88a671cec03d720b015845009ea14bdb5c5363d7dadcc8b01f