From 75fe5ba9be6e08193c3a163f02889fd000e56179 Mon Sep 17 00:00:00 2001
From: Cockpit Project <cockpituous@gmail.com>
Date: Wed, 15 Jul 2020 12:22:23 +0000
Subject: [PATCH] Update to 22-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 across the
  project
- Translation files are updated from fedora weblate
- Cockpit-composer's dependency on osbuild-composer and the weldr group
  is more specific for fedora rawhide and rhel 8
- Coverity scan is now supported to help improve code quality
---
 .gitignore            |  1 +
 cockpit-composer.spec | 24 +++++++++++++++++++++---
 sources               |  2 +-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5799ea6..45b4238 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 /cockpit-composer-19.tar.gz
 /cockpit-composer-20.tar.gz
 /cockpit-composer-21.tar.gz
+/cockpit-composer-22.tar.gz
diff --git a/cockpit-composer.spec b/cockpit-composer.spec
index 30639d1..5a14710 100644
--- a/cockpit-composer.spec
+++ b/cockpit-composer.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        21
+Version:        22
 Release: 1%{?dist}
 Name:           cockpit-composer
 Summary:        Composer GUI for use with Cockpit
@@ -12,8 +12,12 @@ BuildArch:      noarch
 BuildRequires:  libappstream-glib
 
 Requires:       cockpit
-Requires:       weldr
-Suggests:       osbuild-composer >= 14
+%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
@@ -39,6 +43,20 @@ cp -a io.weldr.cockpit-composer.metainfo.xml %{buildroot}/%{_datadir}/metainfo/
 %{_datadir}/metainfo/*
 
 %changelog
+* Wed Jul 15 2020 Jacob Kozol <jacobdkozol@gmail.com> - 22-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 across the
+  project
+- Translation files are updated from fedora weblate
+- Cockpit-composer's dependency on osbuild-composer and the weldr group
+  is more specific for fedora rawhide and rhel 8
+- Coverity scan is now supported to help improve code quality
+
 * Sun Jun 14 2020 Lars Karlitski <lars@karlitski.net> - 21-1
 
 - Support setting parameters (ref and parent) for ostree images
diff --git a/sources b/sources
index cce32e2..51efe47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-composer-21.tar.gz) = 376834bbedfa3a2e76f4e9485442861d2f3aa5a89d6997e35d1c92cc454ee6bf506f194f5f130f440cf9c5a9ed63cc9fc58bfedc72a17db6f65524445d44db5f
+SHA512 (cockpit-composer-22.tar.gz) = d89fb03ddcf1ab763d1def44f183efb514ea5774da9629944fe15bfc42208ce2098c9bc60920480027a7cb6096c8f3710f072515b90a3a1dca969fa5d5c64552