diff --git a/.gitignore b/.gitignore index 59fccae..af6791c 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,4 @@ /osbuild-composer-161.tar.gz /osbuild-composer-163.tar.gz /osbuild-composer-164.tar.gz +/osbuild-composer-176.tar.gz diff --git a/osbuild-composer.spec b/osbuild-composer.spec index 9f78f58..12a65de 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -8,11 +8,11 @@ %bcond_with relax_requires # The minimum required osbuild version -%global min_osbuild_version 171 +%global min_osbuild_version 183 %global goipath github.com/osbuild/osbuild-composer -Version: 164 +Version: 176 %gometa @@ -163,11 +163,11 @@ install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/almalinux # Latest CentOS supports building all CentOS versions %if 0%{?centos} >= 10 -install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/centos-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +install -m 0644 -vp vendor/github.com/osbuild/image-builder/data/repositories/centos-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ %else # All other CentOS versions support building for the same version -install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/centos-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +install -m 0644 -vp vendor/github.com/osbuild/image-builder/data/repositories/centos-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ # centos-stream-* are symlinks cp -a repositories/centos-stream-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ %endif @@ -177,7 +177,13 @@ cp -a repositories/centos-stream-%{centos}* %{buildroot}%{_datadir}/osb %if 0%{?rhel} # RHEL 10 supports building all RHEL versions %if 0%{?rhel} >= 10 -for REPO_FILE in $(ls vendor/github.com/osbuild/images/data/repositories/rhel-* ); do +for REPO_FILE in $(ls vendor/github.com/osbuild/image-builder/data/repositories/rhel-* ); do + install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE}) + +done + +# temporary RHEL 9.7 and 9.8 overrides for new PQC key (for building RHEL 9 on 10) +for REPO_FILE in $(ls repositories/rhel-9*.json); do install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE}) done @@ -188,15 +194,21 @@ done %else # All other RHEL versions support building for the same version -for REPO_FILE in $(ls vendor/github.com/osbuild/images/data/repositories/rhel-%{rhel}* ); do +for REPO_FILE in $(ls vendor/github.com/osbuild/image-builder/data/repositories/rhel-%{rhel}* ); 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 -for REPO_FILE in $(ls vendor/github.com/osbuild/images/data/repositories/rhel-8* ); do +# RHEL 9 supports building also for RHEL 8 +for REPO_FILE in $(ls vendor/github.com/osbuild/image-builder/data/repositories/rhel-8* ); do install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE}) done + +# temporary RHEL 9.7 and 9.8 overrides for new PQC key +for REPO_FILE in $(ls repositories/rhel-9*.json); do + install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE}) +done + %endif %endif @@ -207,7 +219,7 @@ done # Fedora can build for all included fedora releases %if 0%{?fedora} -install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/fedora-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +install -m 0644 -vp vendor/github.com/osbuild/image-builder/data/repositories/fedora-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ %endif install -m 0755 -vd %{buildroot}%{_unitdir} @@ -249,6 +261,9 @@ install -m 0755 -vp test/cases/*.sh %{buildroot}% install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer/api install -m 0755 -vp test/cases/api/*.sh %{buildroot}%{_libexecdir}/tests/osbuild-composer/api/ +install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer/api/bootc +install -m 0755 -vp test/cases/api/bootc/*.sh %{buildroot}%{_libexecdir}/tests/osbuild-composer/api/bootc/ + install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer/api/common install -m 0755 -vp test/cases/api/common/*.sh %{buildroot}%{_libexecdir}/tests/osbuild-composer/api/common/ @@ -337,6 +352,7 @@ The core osbuild-composer binary. This is suitable both for spawning in containe %package worker Summary: The worker for osbuild-composer +Requires: podman Requires: systemd Requires: qemu-img Requires: osbuild >= %{min_osbuild_version} @@ -423,7 +439,11 @@ Requires: firewalld %if (0%{?rhel} && 0%{?rhel} < 10) || (0%{?fedora} && 0%{?fedora} < 40) Requires: podman-plugins %endif -Requires: dnf-plugins-core +%if 0%{?fedora} || 0%{?rhel} >= 11 +Requires: dnf5-command(copr) +%else +Requires: dnf-command(copr) +%endif Requires: skopeo Requires: make Requires: python3-pip @@ -449,10 +469,13 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog -* Wed May 13 2026 Eduard Abdullin - 164-1.alma.2 +* Wed Jul 15 2026 Eduard Abdullin - 176-1.alma.2 - Add AlmaLinux repositories - Add AlmaLinux and AlmaLinux Kitten x86_64_v2 support +* Tue Jul 14 2026 imagebuilder-bot - 176-1 +- New upstream release + * Mon Feb 23 2026 imagebuilder-bot - 164-1 - New upstream release diff --git a/sources b/sources index 5ba452e..d26cc60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-composer-164.tar.gz) = 462d21f104c1f4b2b142808751d90db015f7b48d78d24a7e922ce105d85ae67741e689a71636490c7e56425d512d54f46e407ddfb36371da8aeba1dae9f22b6d +SHA512 (osbuild-composer-176.tar.gz) = b80790218dd79b6933a122eb93921b67265594af55c5411ad41655809c632f126dbfba078d90e105001026da38fc052bb04aae8b94c811e051dd812e898c0272