From 6da3a3e086e57dac8d81b097e05642a0b57c6006 Mon Sep 17 00:00:00 2001 From: imagebuilder-bot Date: Mon, 26 Feb 2024 09:22:16 +0000 Subject: [PATCH] Update to 101 Resolves: RHEL-1035 --- .gitignore | 1 + osbuild-composer.spec | 50 ++++++++++++++++++++----------------------- sources | 2 +- 3 files changed, 25 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index 2018997..8d7e495 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ /osbuild-composer-98.tar.gz /osbuild-composer-99.tar.gz /osbuild-composer-100.tar.gz +/osbuild-composer-101.tar.gz diff --git a/osbuild-composer.spec b/osbuild-composer.spec index 1acecc9..c00149b 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -7,9 +7,12 @@ # This is used internally during nightly pipeline testing! %bcond_with relax_requires +# The minimum required osbuild version +%global min_osbuild_version 109 + %global goipath github.com/osbuild/osbuild-composer -Version: 100 +Version: 101 %gometa @@ -103,6 +106,8 @@ export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/comm %gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer %gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker +%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-jobsite-manager %{goipath}/cmd/osbuild-jobsite-manager +%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-jobsite-builder %{goipath}/cmd/osbuild-jobsite-builder make man @@ -137,7 +142,8 @@ go build -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _b install -m 0755 -vd %{buildroot}%{_libexecdir}/osbuild-composer install -m 0755 -vp _bin/osbuild-composer %{buildroot}%{_libexecdir}/osbuild-composer/ install -m 0755 -vp _bin/osbuild-worker %{buildroot}%{_libexecdir}/osbuild-composer/ -install -m 0755 -vp dnf-json %{buildroot}%{_libexecdir}/osbuild-composer/ +install -m 0755 -vp _bin/osbuild-jobsite-manager %{buildroot}%{_libexecdir}/osbuild-composer/ +install -m 0755 -vp _bin/osbuild-jobsite-builder %{buildroot}%{_libexecdir}/osbuild-composer/ # Only include repositories for the distribution and release install -m 0755 -vd %{buildroot}%{_datadir}/osbuild-composer/repositories @@ -294,7 +300,9 @@ cd $PWD/_build/src/%{goipath} %package core Summary: The core osbuild-composer binary -Requires: %{name}-dnf-json = %{version}-%{release} +Requires: osbuild-depsolve-dnf >= %{min_osbuild_version} +Provides: %{name}-dnf-json = %{version}-%{release} +Obsoletes: %{name}-dnf-json < %{version}-%{release} %description core The core osbuild-composer binary. This is suitable both for spawning in containers and by systemd. @@ -307,17 +315,21 @@ The core osbuild-composer binary. This is suitable both for spawning in containe Summary: The worker for osbuild-composer Requires: systemd Requires: qemu-img -Requires: osbuild >= 98 -Requires: osbuild-ostree >= 98 -Requires: osbuild-lvm2 >= 98 -Requires: osbuild-luks2 >= 98 -Requires: %{name}-dnf-json = %{version}-%{release} +Requires: osbuild >= %{min_osbuild_version} +Requires: osbuild-ostree >= %{min_osbuild_version} +Requires: osbuild-lvm2 >= %{min_osbuild_version} +Requires: osbuild-luks2 >= %{min_osbuild_version} +Requires: osbuild-depsolve-dnf >= %{min_osbuild_version} +Provides: %{name}-dnf-json = %{version}-%{release} +Obsoletes: %{name}-dnf-json < %{version}-%{release} %description worker The worker for osbuild-composer %files worker %{_libexecdir}/osbuild-composer/osbuild-worker +%{_libexecdir}/osbuild-composer/osbuild-jobsite-manager +%{_libexecdir}/osbuild-composer/osbuild-jobsite-builder %{_unitdir}/osbuild-worker@.service %{_unitdir}/osbuild-remote-worker@.service @@ -339,25 +351,6 @@ fi # restart all the worker services %systemd_postun_with_restart "osbuild-worker@*.service" "osbuild-remote-worker@*.service" -%package dnf-json -Summary: The dnf-json binary used by osbuild-composer and the workers - -# Conflicts with older versions of composer that provide the same files -# this can be removed when RHEL 8 reaches EOL -Conflicts: osbuild-composer <= 35 - -%description dnf-json -The dnf-json binary used by osbuild-composer and the workers. - -%files dnf-json -%{_libexecdir}/osbuild-composer/dnf-json - -%post dnf-json -# Fix ownership of the rpmmd cache files from previous versions where it was owned by root:root -if [ -e /var/cache/osbuild-composer/rpmmd ]; then - chown -f -R --from root:root _osbuild-composer:_osbuild-composer /var/cache/osbuild-composer/rpmmd -fi - %if %{with tests} || 0%{?rhel} %package tests @@ -429,6 +422,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Mon Feb 26 2024 imagebuilder-bot - 101-1 +- New upstream release + * Wed Feb 07 2024 imagebuilder-bot - 100-1 - New upstream release diff --git a/sources b/sources index dafdd01..caafdf5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-composer-100.tar.gz) = efe5e7592c01dfcc4513ecbf2b42050831d0c3b2a5837ab116507acbc46a0af50e5ef0ac189dbaf253cd8021f80c76ce7f592260ce909e2b2d04c0969037e96d +SHA512 (osbuild-composer-101.tar.gz) = f2df537865464cbf3eb2d37b5637797ad47d540784ff066fb2108ea44c941363967862b893fd7c72b6338597c880def4786ba4c552fc5b53ea868a1a341fff39