From 3f8047cfa292c4e9a71f7554b7a324305fcc69e9 Mon Sep 17 00:00:00 2001
From: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com>
Date: Thu, 28 Jul 2022 16:03:12 +0000
Subject: [PATCH] Update to 58

Resolves: rhbz#2059870
---
 .gitignore            |  1 +
 osbuild-composer.spec | 21 ++++++++-------------
 sources               |  2 +-
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1394099..6f28647 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@
 /osbuild-composer-54.tar.gz
 /osbuild-composer-55.tar.gz
 /osbuild-composer-57.tar.gz
+/osbuild-composer-58.tar.gz
diff --git a/osbuild-composer.spec b/osbuild-composer.spec
index af1e695..84a208c 100644
--- a/osbuild-composer.spec
+++ b/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
+
 * Wed Jul 13 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 57-1
 - New upstream release
 
diff --git a/sources b/sources
index 4ee3777..5c182aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (osbuild-composer-57.tar.gz) = 10cc9c284e08fd1674f71cf379596fc7c4b207b9ecdb280c908f7510c364fd621617ef8c2e7a1008e65ee4360b41e52c5dab373bb11fde97ec0bcb3b6d399771
+SHA512 (osbuild-composer-58.tar.gz) = 8e58cf424a10b294453703d86a928cc0f011a17cd6af98515c205e39821d175dd3e4881124dab43e2ffbe52751f0e29d05ac32eebc853927ea8178b5833f5020