From 9ab385af7b4ec3c439922be6110a0370361ca4ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <ondrej@budai.cz>
Date: Wed, 4 May 2022 18:17:11 +0200
Subject: [PATCH] Update to 51

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

diff --git a/.gitignore b/.gitignore
index bfd53c2..ce0790b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@
 /osbuild-composer-44.tar.gz
 /osbuild-composer-45.tar.gz
 /osbuild-composer-46.tar.gz
+/osbuild-composer-51.tar.gz
diff --git a/osbuild-composer.spec b/osbuild-composer.spec
index d492f9f..99e3f90 100644
--- a/osbuild-composer.spec
+++ b/osbuild-composer.spec
@@ -9,7 +9,7 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        46
+Version:        51
 
 %gometa
 
@@ -52,6 +52,7 @@ BuildRequires:  golang(github.com/deepmap/oapi-codegen/pkg/codegen)
 BuildRequires:  golang(github.com/go-chi/chi)
 BuildRequires:  golang(github.com/golang-jwt/jwt)
 BuildRequires:  golang(github.com/google/uuid)
+BuildRequires:  golang(github.com/hashicorp/go-retryablehttp)
 BuildRequires:  golang(github.com/jackc/pgx/v4)
 BuildRequires:  golang(github.com/julienschmidt/httprouter)
 BuildRequires:  golang(github.com/getkin/kin-openapi/openapi3)
@@ -227,6 +228,7 @@ install -m 0755 -vp tools/run-koji-container.sh                    %{buildroot}%
 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/set-env-variables.sh                     %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp tools/test-case-generators/generate-test-cases %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vd                                                %{buildroot}%{_libexecdir}/tests/osbuild-composer
@@ -324,10 +326,10 @@ 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 >= 49
-Requires:   osbuild-ostree >= 49
-Requires:   osbuild-lvm2 >= 49
-Requires:   osbuild-luks2 >= 49
+Requires:   osbuild >= 52
+Requires:   osbuild-ostree >= 52
+Requires:   osbuild-lvm2 >= 52
+Requires:   osbuild-luks2 >= 52
 Requires:   %{name}-dnf-json = %{version}-%{release}
 
 # remove in F34
@@ -418,10 +420,7 @@ Requires:   httpd
 Requires:   mod_ssl
 Requires:   openssl
 Requires:   firewalld
-# see https://bugzilla.redhat.com/show_bug.cgi?id=1986333
-%if 0%{?rhel} && 0%{?rhel} != 9
 Requires:   podman-plugins
-%endif
 Requires:   dnf-plugins-core
 Requires:   skopeo
 %if 0%{?fedora}
@@ -446,6 +445,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
+* Wed May 04 2022 Ondřej Budai <ondrej@budai.cz> - 51-1
+- New upstream release
+
 * Mon Feb 28 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 46-1
 - New upstream release
 
diff --git a/sources b/sources
index 0e71ac1..446521d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (osbuild-composer-46.tar.gz) = 273028d9e0cdf64824a643a69c9972fee91d5b316f9c62a426466f629ce9d1dee13245bb7bbd2d2541181ad565e4a8feab22781ea66f33168003f5626e3c595c
+SHA512 (osbuild-composer-51.tar.gz) = e326e942894281eab405b58366cc8d2e47c8e9a6629c9b11b915fa82edeb092474032938b234ab2ff3ca98183f705a705fa9066b9e0dcffed4fd6f936a160800