From 06e56c09129e6418725606c48a12f4e86bcd357e Mon Sep 17 00:00:00 2001
From: importbot <releng@rockylinux.org>
Date: Wed, 16 Oct 2024 15:57:33 +0000
Subject: [PATCH] import osbuild-composer-123-1.el10
---
.osbuild-composer.metadata | 2 +-
SPECS/osbuild-composer.spec | 14 ++++++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata
index a83ea2b..ba9ca20 100644
--- a/.osbuild-composer.metadata
+++ b/.osbuild-composer.metadata
@@ -1 +1 @@
-f0e1138ecf8459abfa2b85ae9ca37556563a44112ac9b5e0f1962297225cab9f SOURCES/osbuild-composer-118.tar.gz
+2cdb78f112fc870923ff667e355d6250cae32b970028b74dee5b00e9feb437fd SOURCES/osbuild-composer-123.tar.gz
diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec
index c80736d..f755932 100644
--- a/SPECS/osbuild-composer.spec
+++ b/SPECS/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: 123
%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
+* Wed Oct 16 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 123-1
+- New upstream release
+
* Fri Aug 23 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 118-1
- New upstream release
--
GitLab