From 929f7f149501ec093e27e1d56faf87d58c840aa6 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 28 2021 05:20:06 +0000
Subject: import cockpit-podman-32-2.module+el8.5.0+11957+18363336


---

diff --git a/.cockpit-podman.metadata b/.cockpit-podman.metadata
index 1285362..7abb95a 100644
--- a/.cockpit-podman.metadata
+++ b/.cockpit-podman.metadata
@@ -1 +1 @@
-77aa54b1a76e5f42600de56f980ce4b3176d64d3 SOURCES/cockpit-podman-29.tar.gz
+b884079550e51359bbf5c81a849b20b8dcbe9e42 SOURCES/cockpit-podman-32.tar.gz
diff --git a/.gitignore b/.gitignore
index 7b05f49..4e6f1b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/cockpit-podman-29.tar.gz
+SOURCES/cockpit-podman-32.tar.gz
diff --git a/SOURCES/739.patch b/SOURCES/739.patch
new file mode 100644
index 0000000..238fc70
--- /dev/null
+++ b/SOURCES/739.patch
@@ -0,0 +1,22 @@
+From 524c56af2571d187097a1c5e271008b641babeb4 Mon Sep 17 00:00:00 2001
+From: Matej Marusak <mmarusak@redhat.com>
+Date: Tue, 20 Jul 2021 14:59:19 +0200
+Subject: [PATCH] test: Don't check if user or system service failed to start
+
+It seems that this can hit system podman as well.
+---
+ test/check-application | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/test/check-application b/test/check-application
+index 04508c61..47cf95f0 100755
+--- a/test/check-application
++++ b/test/check-application
+@@ -110,7 +110,6 @@ class TestApplication(testlib.MachineCase):
+                 b.wait_not_present("#overview div.pf-c-alert")
+             except testlib.Error:
+                 if system:
+-                    b.wait_in_text("#overview div.pf-c-alert .pf-c-alert__title", "User Podman service is also available")
+                     b.click("#overview div.pf-c-alert .pf-c-alert__action > button:contains(Start)")
+                     b.wait_not_present("#overview div.pf-c-alert")
+                 else:
diff --git a/SOURCES/cockpit-podman-1937863.patch b/SOURCES/cockpit-podman-1937863.patch
deleted file mode 100644
index a802707..0000000
--- a/SOURCES/cockpit-podman-1937863.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d4f06e0e0b9529bfa3d17c1ef73c028752ee1bb7 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin@piware.de>
-Date: Thu, 4 Mar 2021 20:11:47 +0100
-Subject: [PATCH] test: Generalize cgroupsV2() for all rhel-8-* versions
-
-It looks like RHEL newer 8.y versions won't get cgroupsv2 either, so
-generalize the check.
----
- test/check-application | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/check-application b/test/check-application
-index 0b163ce7..a40f2d90 100755
---- a/test/check-application
-+++ b/test/check-application
-@@ -80,7 +80,7 @@ class TestApplication(testlib.MachineCase):
-         self.has_selinux = self.machine.image not in ["debian-testing", "ubuntu-stable"]
- 
-     def cgroupsV2(self):
--        return self.machine.image not in ["ubuntu-stable", "rhel-8-4"]
-+        return self.machine.image != 'ubuntu-stable' and not self.machine.image.startswith('rhel-8')
- 
-     def execute(self, system, cmd):
-         if system:
diff --git a/SPECS/cockpit-podman.spec b/SPECS/cockpit-podman.spec
index ecf3c56..5df9c8f 100644
--- a/SPECS/cockpit-podman.spec
+++ b/SPECS/cockpit-podman.spec
@@ -1,15 +1,13 @@
 # This spec file has been automatically updated
-Version: 29
-Release:        3%{?dist}
+Version: 32
+Release:        2%{?dist}
 Name:           cockpit-podman
 Summary:        Cockpit component for Podman containers
 License:        LGPLv2+
 URL:            https://github.com/cockpit-project/cockpit-podman
 
 Source0:        https://github.com/cockpit-project/cockpit-podman/releases/download/%{version}/cockpit-podman-%{version}.tar.gz
-# related bug: https://bugzilla.redhat.com/show_bug.cgi?id=1937863
-# patch:       https://patch-diff.githubusercontent.com/raw/cockpit-project/cockpit-podman/pull/688.patch
-Patch0: cockpit-podman-1937863.patch
+Patch0:         https://patch-diff.githubusercontent.com/raw/cockpit-project/cockpit-podman/pull/739.patch
 BuildArch:      noarch
 BuildRequires:  libappstream-glib
 
@@ -21,8 +19,6 @@ The Cockpit user interface for Podman containers.
 
 %prep
 %setup -q -n cockpit-podman
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1937863
 %patch0 -p1
 
 %build
@@ -39,6 +35,22 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*
 %{_datadir}/metainfo/*
 
 %changelog
+* Wed Jul 21 2021 Jindrich Novy <jnovy@redhat.com> - 32-2
+- attempt to fix gating tests - thanks for Matej Marusak
+- Related: #1934415
+
+* Mon Jul 05 2021 Jindrich Novy <jnovy@redhat.com> - 32-1
+- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/32
+- Related: #1934415
+
+* Wed May 26 2021 Jindrich Novy <jnovy@redhat.com> - 31-1
+- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/31
+- Related: #1934415
+
+* Mon Apr 26 2021 Jindrich Novy <jnovy@redhat.com> - 30-1
+- fix gating test failure for cockpit-podman
+- Related: #1934415
+
 * Thu Mar 11 2021 Jindrich Novy <jnovy@redhat.com> - 29-3
 - fix gating test failure for cockpit-podman
 - Related: #1934415