From 36b2d27f58fb14d3df500ca5aa3bbdfadec1c471729d14d3b9ded16be8227690 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <lnussel@suse.com>
Date: Thu, 10 Sep 2020 12:49:32 +0000
Subject: [PATCH] - adjust spec file to match upstream

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=46
---
 cockpit.changes |  5 +++++
 cockpit.spec    | 16 ++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/cockpit.changes b/cockpit.changes
index 46e4df7..b7abdbb 100644
--- a/cockpit.changes
+++ b/cockpit.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 10 12:49:00 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- adjust spec file to match upstream
+
 -------------------------------------------------------------------
 Fri Sep  4 12:09:16 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
 
diff --git a/cockpit.spec b/cockpit.spec
index b5bc804..484fc47 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -469,19 +469,12 @@ Summary: Cockpit Web Service
 Requires: glib-networking
 Requires: openssl
 Requires: glib2 >= 2.37.4
-Requires: group(wheel)
 Conflicts: firewalld < 0.6.0-1
 Recommends: sscg >= 2.3
 Recommends: system-logos
-%if !0%{?suse_version}
-Requires: systemd >= 235
-%endif
 Suggests: sssd-dbus
+%if 0%{?suse_version}
 Requires(pre): permissions
-%if !0%{?suse_version}
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
 %endif
 
 %description ws
@@ -530,8 +523,7 @@ authentication via sssd/FreeIPA.
 %{_libexecdir}/cockpit-wsinstance-factory
 %{_libexecdir}/cockpit-tls
 %{_libexecdir}/cockpit-desktop
-%attr(4750, root, cockpit-wsinstance) %{_libexecdir}/cockpit-session
-%attr(775, -, wheel) %{_localstatedir}/lib/cockpit
+%{?suse_version:%verify(not mode) }%attr(4750, root, cockpit-wsinstance) %{_libexecdir}/cockpit-session
 %{_datadir}/cockpit/static
 %{_datadir}/cockpit/branding
 
@@ -542,7 +534,9 @@ getent group cockpit-wsinstance >/dev/null || groupadd -r cockpit-wsinstance
 getent passwd cockpit-wsinstance >/dev/null || useradd -r -g cockpit-wsinstance -d /nonexisting -s /sbin/nologin -c "User for cockpit-ws instances" cockpit-wsinstance
 
 %post ws
+%if 0%{?suse_version}
 %set_permissions %{_libexecdir}/cockpit-session
+%endif
 %tmpfiles_create cockpit-tempfiles.conf
 %systemd_post cockpit.socket
 # firewalld only partially picks up changes to its services files without this
@@ -555,8 +549,10 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
 %systemd_postun_with_restart cockpit.socket
 %systemd_postun_with_restart cockpit.service
 
+%if 0%{?suse_version}
 %verifyscript ws
 %verify_permissions -e %{_libexecdir}/cockpit-session
+%endif
 
 # -------------------------------------------------------------------------------
 # Sub-packages that are part of cockpit-system in RHEL/CentOS, but separate in Fedora