From 93fd2e857060d11568d4998891133c8acf438abe Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Thu, 11 Mar 2021 20:05:12 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/osbuild-composer.git#bb1718d6ad58708cf108fe464c99b946b8ec714e
---
 .gitignore            |  1 +
 osbuild-composer.spec | 29 ++++++++++++++++-------------
 sources               |  2 +-
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8f60f92..08a458b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /osbuild-composer-26.tar.gz
 /osbuild-composer-27.tar.gz
 /osbuild-composer-28.tar.gz
+/osbuild-composer-29.tar.gz
diff --git a/osbuild-composer.spec b/osbuild-composer.spec
index 1836020..05a92da 100644
--- a/osbuild-composer.spec
+++ b/osbuild-composer.spec
@@ -4,14 +4,16 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        28
+Version:        29
 
 %gometa
 
 %global common_description %{expand:
-An image building service based on osbuild
-It is inspired by lorax-composer and exposes the same API.
-As such, it is a drop-in replacement.
+A service for building customized OS artifacts, such as VM images and OSTree
+commits, that uses osbuild under the hood. Besides building images for local
+usage, it can also upload images directly to cloud.
+
+It is compatible with composer-cli and cockpit-composer clients.
 }
 
 Name:           osbuild-composer
@@ -55,6 +57,7 @@ BuildRequires:  golang(github.com/gophercloud/gophercloud)
 BuildRequires:  golang(github.com/stretchr/testify/assert)
 BuildRequires:  golang(github.com/ubccr/kerby)
 BuildRequires:  golang(github.com/vmware/govmomi)
+BuildRequires:  golang(cloud.google.com/go)
 %endif
 
 Requires: %{name}-core = %{version}-%{release}
@@ -203,6 +206,9 @@ install -m 0644 -vp test/data/cloud-init/*                      %{buildroot}%{_d
 install -m 0755 -vd                                             %{buildroot}%{_datadir}/tests/osbuild-composer/composer
 install -m 0644 -vp test/data/composer/*                        %{buildroot}%{_datadir}/tests/osbuild-composer/composer/
 
+install -m 0755 -vd                                             %{buildroot}%{_datadir}/tests/osbuild-composer/worker
+install -m 0644 -vp test/data/worker/*                          %{buildroot}%{_datadir}/tests/osbuild-composer/worker/
+
 install -m 0755 -vd                                             %{buildroot}%{_datadir}/tests/osbuild-composer/repositories
 install -m 0644 -vp test/data/repositories/*                    %{buildroot}%{_datadir}/tests/osbuild-composer/repositories/
 
@@ -219,12 +225,6 @@ install -m 0644 -vp test/data/koji/*                            %{buildroot}%{_d
 install -m 0755 -vd                                             %{buildroot}%{_datadir}/tests/osbuild-composer/x509
 install -m 0644 -vp test/data/x509/*                            %{buildroot}%{_datadir}/tests/osbuild-composer/x509/
 
-%if 0%{?rhel}
-install -m 0755 -vd                                             %{buildroot}%{_datadir}/tests/osbuild-composer/vendor
-install -m 0644 -vp test/data/vendor/87-podman-bridge.conflist  %{buildroot}%{_datadir}/tests/osbuild-composer/vendor/
-install -m 0755 -vp test/data/vendor/dnsname                    %{buildroot}%{_datadir}/tests/osbuild-composer/vendor/
-%endif
-
 %endif
 
 %check
@@ -273,8 +273,8 @@ 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 >= 24
-Requires:   osbuild-ostree >= 24
+Requires:   osbuild >= 26
+Requires:   osbuild-ostree >= 26
 
 # remove in F34
 Obsoletes: golang-github-osbuild-composer-worker < %{version}-%{release}
@@ -341,8 +341,8 @@ Requires:   expect
 Requires:   python3-lxml
 Requires:   httpd
 Requires:   openssl
-%if 0%{?fedora}
 Requires:   podman-plugins
+%if 0%{?fedora}
 # koji and ansible are not in RHEL repositories. Depending on them breaks RHEL
 # gating (see OSCI-1541). The test script must enable EPEL and install those
 # packages manually.
@@ -364,6 +364,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
+* Fri Mar 05 2021 Martin Sehnoutka <msehnout@redhat.com> - 29-1
+- New upstream release
+
 * Sat Feb 20 2021 Martin Sehnoutka <msehnout@redhat.com> - 28-1
 - New upstream release
 
diff --git a/sources b/sources
index eda995a..89825bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (osbuild-composer-28.tar.gz) = 789d93d1d7f70533bc835079e63d3d36348a6d37888400dbe3569e3a6f4e813341042ca7252732aa6003d3d6180089d4ee1dd9504d9a2b5c3ebc1f0b9d0cbac4
+SHA512 (osbuild-composer-29.tar.gz) = d8be239756dcf68f566686ff554111a474153478346bcc14a9f71b1b9a7cfb4bc22113940ac81f34587ea4ec436837ac9061f6a26cd9e21b709baf9f0da73342