Skip to content
Snippets Groups Projects
Commit 32e76b0c authored by Rocky Automation's avatar Rocky Automation :tv:
Browse files

import osbuild-composer-116-1.el10

parent 66a4eccc
No related branches found
Tags imports/r10s/osbuild-composer-134-1.el10
No related merge requests found
ef8985ae352b2f952c68aaba9b09af662ab4225d99dde1cceaefd5e28be8b054 SOURCES/osbuild-composer-115.tar.gz
e7ef4a45ba8cdffa36f9454e08cddb53148bf93c844fe2d90002f2a4698e6636 SOURCES/osbuild-composer-116.tar.gz
......@@ -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
......@@ -174,7 +174,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
......@@ -183,11 +185,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
......@@ -456,9 +462,12 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif
%changelog
* Wed Aug 07 2024 Release Engineering <releng@rockylinux.org> - 115-1.rocky.0.6
* Mon Aug 19 2024 Release Engineering <releng@rockylinux.org> - 116-1.rocky.0.6
- Add Rocky Linux support and host detection
* 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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment