diff --git a/.gitignore b/.gitignore index 08ab89b..40e73ed 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-composer-100.tar.gz +SOURCES/osbuild-composer-101.tar.gz diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata index 2307b8e..7f36b97 100644 --- a/.osbuild-composer.metadata +++ b/.osbuild-composer.metadata @@ -1 +1 @@ -ee2bb2068e42599ca6ef66499d00077ee06b3b44 SOURCES/osbuild-composer-100.tar.gz +0feb86b5dcd146ce5b87816ae482eb50ed507c16 SOURCES/osbuild-composer-101.tar.gz diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index 3579a49..3aefa28 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/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 @@ -33,7 +36,6 @@ License: Apache-2.0 URL: %{gourl} Source0: %{gosource} -# MSVSphere patches Patch1001: 0001-Added-MSVSphere-support.patch BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} @@ -105,6 +107,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 @@ -139,7 +143,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 @@ -308,7 +313,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. @@ -321,17 +328,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 @@ -353,25 +364,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 @@ -443,9 +435,12 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog -* Tue Apr 2 2024 Arkady L. Shane - 100-1.inferit +* Wed May 1 2024 Arkady L. Shane - 101-1.inferit - Added MSVSphere support +* Mon Feb 26 2024 imagebuilder-bot - 101-1 +- New upstream release + * Wed Feb 07 2024 imagebuilder-bot - 100-1 - New upstream release