From 6c290fd8172997232043c89e451b4f6896f1e5a6 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 3 Nov 2020 07:00:54 -0500
Subject: [PATCH] import cockpit-composer-22.1-1.el8

---
 .cockpit-composer.metadata  |  2 +-
 .gitignore                  |  2 +-
 SPECS/cockpit-composer.spec | 39 ++++++++++++++++++++++++++++++-------
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/.cockpit-composer.metadata b/.cockpit-composer.metadata
index 223348e..93fc55e 100644
--- a/.cockpit-composer.metadata
+++ b/.cockpit-composer.metadata
@@ -1 +1 @@
-348f01d4972dd228c1f4012ef911b81fecdad18d SOURCES/cockpit-composer-12.1.tar.gz
+2dab59cff6976b91776c2f8ddb29408a66147750 SOURCES/cockpit-composer-22.1.tar.gz
diff --git a/.gitignore b/.gitignore
index e65c047..81629b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/cockpit-composer-12.1.tar.gz
+SOURCES/cockpit-composer-22.1.tar.gz
diff --git a/SPECS/cockpit-composer.spec b/SPECS/cockpit-composer.spec
index 6e0d096..e7feedb 100644
--- a/SPECS/cockpit-composer.spec
+++ b/SPECS/cockpit-composer.spec
@@ -1,25 +1,29 @@
-# This spec file has been automatically updated
-Version:        12.1
-Release: 1%{?dist}
 Name:           cockpit-composer
+Version:        22.1
+Release:        1%{?dist}
 Summary:        Composer GUI for use with Cockpit
 
 License:        MIT
 URL:            http://weldr.io/
-Source0:        https://github.com/weldr/cockpit-composer/releases/download/%{version}/cockpit-composer-%{version}.tar.gz
+Source0:        https://github.com/osbuild/cockpit-composer/releases/download/%{version}/cockpit-composer-%{version}.tar.gz
 
 BuildArch:      noarch
 BuildRequires:  libappstream-glib
 
 Requires:       cockpit
-Requires:       lorax-composer
+%if 0%{?fedora} >= 33 || 0%{?rhel} >= 8
+Requires: osbuild-composer >= 14
+%else
+Requires: weldr
+Suggests: osbuild-composer >= 14
+%endif
 
 %description
 Composer generates custom images suitable for deploying systems or uploading to
-the cloud. It integrates into Cockpit as a frontend for Lorax Composer.
+the cloud. It integrates into Cockpit as a frontend for osbuild.
 
 %prep
-%setup -q -n cockpit-composer-%{version}
+%setup -q -n cockpit-composer
 
 %build
 # Nothing to build
@@ -38,6 +42,27 @@ cp -a io.weldr.cockpit-composer.metainfo.xml %{buildroot}/%{_datadir}/metainfo/
 %{_datadir}/metainfo/*
 
 %changelog
+* Wed Jul 15 2020 Jacob Kozol <jkozol@redhat.com> - 22.1-1
+- Patternfly imports are standardized to be consistent with cockpit
+- Cancel image build button bug fixed
+- Empty components state provides a help message
+- Wizard component has bug fixes and is refactored for future scalability
+- Test updates
+- ESLint upgraded to version 7 and the code style is improved
+- Translation files are updated from fedora weblate
+- Cockpit-composer's dependency on osbuild-composer  is more specific
+- Coverity scan is now supported to help improve code quality
+- Resolves: #1820539 
+
+* Wed Jun 14 2020 Lars Karlitski <larskarlitski@redhat.com> - 21.1-1
+- Support setting parameters (ref and parent) for ostree images
+- Loosen restrictions on password strength
+- Various UI refinements
+
+* Wed Jun 08 2020 Lars Karlitski <larskarlitski@redhat.com> - 20.1-1
+- Migrate to the osbuild-composer backend
+- Supports uploading images to AWS and Azure
+
 * Wed Feb 19 2020 Matej Marusak <mmarusak@redhat.com> - 12.1-1
 - Fix integration tests, external test repository URL ceased to exist
 - Translation updates rhbz#1784453