From f23a51498a824437635e0d008fa98d6f53899db5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <obudai@redhat.com>
Date: Mon, 29 Jun 2020 19:59:07 +0200
Subject: [PATCH] New upstream version 16

---
 .gitignore            |  1 +
 osbuild-composer.spec | 18 ++++++++++++++----
 sources               |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index ce2edef..6e129d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /osbuild-composer-13.tar.gz
 /osbuild-composer-14.tar.gz
 /osbuild-composer-15.tar.gz
+/osbuild-composer-16.tar.gz
diff --git a/osbuild-composer.spec b/osbuild-composer.spec
index ba84021..79dd25d 100644
--- a/osbuild-composer.spec
+++ b/osbuild-composer.spec
@@ -4,7 +4,7 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        15
+Version:        16
 
 %gometa
 
@@ -43,16 +43,22 @@ BuildRequires:  golang(github.com/google/uuid)
 BuildRequires:  golang(github.com/julienschmidt/httprouter)
 BuildRequires:  golang(github.com/gobwas/glob)
 BuildRequires:  golang(github.com/google/go-cmp/cmp)
+BuildRequires:  golang(github.com/gophercloud/gophercloud)
 BuildRequires:  golang(github.com/stretchr/testify/assert)
 %endif
 
-Requires: osbuild-composer-worker
+Requires: %{name}-worker = %{version}-%{release}
 Requires: systemd
 Requires: osbuild >= 17
 Requires: osbuild-ostree >= 17
 
 Provides: weldr
 
+%if 0%{?rhel}
+Obsoletes: lorax-composer <= 28
+Conflicts: lorax-composer
+%endif
+
 # remove in F34
 Obsoletes: golang-github-osbuild-composer < %{version}-%{release}
 Provides:  golang-github-osbuild-composer = %{version}-%{release}
@@ -177,7 +183,7 @@ export GOPATH=$PWD/_build:%{gopath}
 
 %package rcm
 Summary:    RCM-specific version of osbuild-composer
-Requires:   osbuild-composer
+Requires:   %{name} = %{version}-%{release}
 
 # remove in F34
 Obsoletes: golang-github-osbuild-composer-rcm < %{version}-%{release}
@@ -235,7 +241,8 @@ systemctl stop "osbuild-worker@*.service" "osbuild-remote-worker@*.service"
 
 %package tests
 Summary:    Integration tests
-Requires:   osbuild-composer
+Requires:   %{name} = %{version}-%{release}
+Requires:   %{name}-rcm = %{version}-%{release}
 Requires:   composer-cli
 Requires:   createrepo_c
 Requires:   genisoimage
@@ -255,6 +262,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
+* Mon Jun 29 2020 Ondrej Budai <obudai@redhat.com> - 16-1
+- New upstream release
+
 * Fri Jun 12 2020 Ondrej Budai <obudai@redhat.com> - 15-1
 - New upstream release
 
diff --git a/sources b/sources
index d018119..7e7e81e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (osbuild-composer-15.tar.gz) = 44ee04834ec1706177bb2740092864ec21873faa6d5b041dd46d03acead4f6d185d4c7079d9a98c215e613b722e1eb42e96866dcbc4e465e21a840832a579e4a
+SHA512 (osbuild-composer-16.tar.gz) = 478388f7197a5981a27afc00c15eb25d8bea9f644cef7731d17c77eb63c16cae2d6f61254f4d86bc767348367a4113d5c3d69576732657f1429b4669bf539e5b