From 24ba3189b526911bcbdec544302fdeeaf99781a8 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Wed, 3 Aug 2022 10:14:56 +0000
Subject: [PATCH] import osbuild-composer-58-1.el8

---
 .gitignore                  |  2 +-
 .osbuild-composer.metadata  |  2 +-
 SPECS/osbuild-composer.spec | 21 ++++++++-------------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2ca60ac..b5c2435 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/osbuild-composer-57.tar.gz
+SOURCES/osbuild-composer-58.tar.gz
diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata
index ae3044f..a48bbe6 100644
--- a/.osbuild-composer.metadata
+++ b/.osbuild-composer.metadata
@@ -1 +1 @@
-a92fd9ee889bade3c7ac5dbd73ef89c00bb1565b SOURCES/osbuild-composer-57.tar.gz
+b043f3dc861a58103c010cfd1fadfc8634e1389d SOURCES/osbuild-composer-58.tar.gz
diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec
index dc3b23d..b2bba3b 100644
--- a/SPECS/osbuild-composer.spec
+++ b/SPECS/osbuild-composer.spec
@@ -9,7 +9,7 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        57
+Version:        58
 
 %gometa
 
@@ -67,9 +67,6 @@ Conflicts: lorax-composer
 Obsoletes: lorax-composer < 34.3
 %endif
 
-# remove when F34 is EOL
-Obsoletes: osbuild-composer-koji <= 23
-
 %description
 %{common_description}
 
@@ -204,7 +201,6 @@ install -m 0755 -vp tools/gen-ssh.sh                               %{buildroot}%
 install -m 0755 -vp tools/image-info                               %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp tools/run-koji-container.sh                    %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp tools/koji-compose.py                          %{buildroot}%{_libexecdir}/osbuild-composer-test/
-install -m 0755 -vp tools/koji-compose-v2.py                       %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp tools/libvirt_test.sh                          %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp tools/s3_test.sh                               %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp tools/generic_s3_test.sh                       %{buildroot}%{_libexecdir}/osbuild-composer-test/
@@ -312,16 +308,12 @@ 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 >= 55
-Requires:   osbuild-ostree >= 55
-Requires:   osbuild-lvm2 >= 55
-Requires:   osbuild-luks2 >= 55
+Requires:   osbuild >= 62
+Requires:   osbuild-ostree >= 62
+Requires:   osbuild-lvm2 >= 62
+Requires:   osbuild-luks2 >= 62
 Requires:   %{name}-dnf-json = %{version}-%{release}
 
-# remove in F34
-Obsoletes: golang-github-osbuild-composer-worker < %{version}-%{release}
-Provides:  golang-github-osbuild-composer-worker = %{version}-%{release}
-
 %description worker
 The worker for osbuild-composer
 
@@ -431,6 +423,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
+* Thu Jul 28 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 58-1
+- New upstream release
+
 * Mon Jul 18 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 57-1
 - New upstream release