From a525eb36377115b941e04e5ad9d8f671adecd40c Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 14 2020 01:45:08 +0000
Subject: import osbuild-composer-16-1.el8


---

diff --git a/.gitignore b/.gitignore
index 8714a23..5f379f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/osbuild-composer-14.tar.gz
+SOURCES/osbuild-composer-16.tar.gz
diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata
index 2e6510f..b31f699 100644
--- a/.osbuild-composer.metadata
+++ b/.osbuild-composer.metadata
@@ -1 +1 @@
-d6be9a3e978e73a48c7105c98f16c0d5dc1ecec6 SOURCES/osbuild-composer-14.tar.gz
+afea68a426c02a93b7a21d3d06171523161be521 SOURCES/osbuild-composer-16.tar.gz
diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec
index c003d32..526fb1f 100644
--- a/SPECS/osbuild-composer.spec
+++ b/SPECS/osbuild-composer.spec
@@ -4,7 +4,7 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        14
+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 >= 15
-Requires: osbuild-ostree >= 15
+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,15 @@ 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 16 (rhbz#1831653)
+
+* Fri Jun 12 2020 Ondrej Budai <obudai@redhat.com> - 15-1
+- New upstream release 15 (rhbz#1831653)
+
+* Thu Jun 04 2020 Ondrej Budai <obudai@redhat.com> - 14-1
+- New upstream release 14 (rhbz#1831653)
+
 * Thu May 28 2020 Ondrej Budai <obudai@redhat.com> - 13-1
 - New upstream release 13 (rhbz#1831653)