diff --git a/.gitignore b/.gitignore index 2715394..0ee7524 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ /osbuild-composer-116.tar.gz /osbuild-composer-117.tar.gz /osbuild-composer-118.tar.gz +/osbuild-composer-121.tar.gz diff --git a/osbuild-composer.spec b/osbuild-composer.spec index bdd9d23..5ddf9b1 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 120 +%global min_osbuild_version 129 %global goipath github.com/osbuild/osbuild-composer -Version: 118 +Version: 121 %gometa @@ -285,8 +285,8 @@ install -m 0644 -vp test/data/x509/* %{buildroot}% install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/schemas install -m 0644 -vp pkg/jobqueue/dbjobqueue/schemas/* %{buildroot}%{_datadir}/tests/osbuild-composer/schemas/ -install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/upgrade8to9 -install -m 0644 -vp test/data/upgrade8to9/* %{buildroot}%{_datadir}/tests/osbuild-composer/upgrade8to9/ +install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/rhel-upgrade +install -m 0644 -vp test/data/rhel-upgrade/* %{buildroot}%{_datadir}/tests/osbuild-composer/rhel-upgrade/ %endif @@ -326,6 +326,9 @@ cd $PWD/_build/src/%{goipath} %package core Summary: The core osbuild-composer binary Requires: osbuild-depsolve-dnf >= %{min_osbuild_version} +# This version needs to get bumped everytime the osbuild-depsolve-dnf json +# API changes in incompatible ways +Requires: osbuild-dnf-json-api = 7 Provides: %{name}-dnf-json = %{version}-%{release} Obsoletes: %{name}-dnf-json < %{version}-%{release} @@ -452,6 +455,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Mon Sep 30 2024 imagebuilder-bot - 121-1 +- New upstream release + * Fri Aug 23 2024 imagebuilder-bot - 118-1 - New upstream release diff --git a/sources b/sources index 5f5e51c..55824b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-composer-118.tar.gz) = be9a4b4080f19116dd1c3e885139a0b8ef58961d6a34c49d8c2b2c77b42ff7d99dabac72b232ed5bdfd599461cbc6b228785610eb22e139dcc2a803164c29a2a +SHA512 (osbuild-composer-121.tar.gz) = e9c5d9aace6ae37f04c45f53fdc8c94c2d10ee4bb7ec2d373c7248dd0d6b469553972b3cc60c9add67b84689edd1a77047c96488893923efaadc11c6e2098d3d