Accepting request 1192625 from systemsmanagement:cockpit

fix changes file to not delete a changes entry for Factory (forwarded request 1192616 from jzerebecki)

OBS-URL: https://build.opensuse.org/request/show/1192625
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cockpit?expand=0&rev=49

cockpit.changes

@@ -1,4 +1,20 @@
 -------------------------------------------------------------------
+Thu Aug  8 12:21:51 UTC 2024 - Jan Zerebecki <jan.suse@zerebecki.de>
+
+- revert load pam_oath, because it enforces the file for otp secrets to exist,
+  will try again once pam_oath can have that optional
+
+-------------------------------------------------------------------
+Wed Aug  7 20:25:34 UTC 2024 - Herbert Graeber <herbert@graeber-clan.de>
+
+- fix-libexecdir.patch: Fix libexecdir for leap and sle (bsc#1223533)
+- Fix systemd units folder for leap and sle (bsc#1226541)
+
+-------------------------------------------------------------------
+Sat Aug  7 09:37:00 UTC 2024 - pallas wept <pallaswept@proton.me>
+
+- Recommend cockpit-packagekit if zypper is installed
+
 Wed Aug  7 09:36:58 UTC 2024 - Jan Zerebecki <jan.suse@zerebecki.de>
 
 - load pam_oath for optional TOTP for authentication

cockpit.pam

@@ -8,4 +8,3 @@ password include common-password
 session required pam_loginuid.so
 session optional pam_keyinit.so force revoke
 session include common-session
-auth [user_unknown=ignore success=ok] pam_oath.so usersfile=${HOME}/.pam_oath_usersfile window=20 digits=6

cockpit.spec

@@ -72,6 +72,7 @@ Patch102:       0002-selinux-temporary-remove-setroubleshoot-section.patch
 # For anything based on SLES 15 codebase (including Leap, SLE Micro)
 Patch103:       0004-leap-gnu18-removal.patch
 Patch104:       selinux_libdir.patch
+Patch105:       fix-libexecdir.patch
 
 %define build_all 1
 %if 0%{?rhel} == 8 && 0%{?epel} == 0 && !0%{?build_all}
@@ -190,7 +191,7 @@ Requires: cockpit-system
 
 # Optional components
 Recommends: (cockpit-storaged if udisks2)
-Recommends: (cockpit-packagekit if dnf)
+Recommends: (cockpit-packagekit if (dnf or zypper))
 Suggests: cockpit-pcp
 
 %if 0%{?rhel} == 0
@@ -235,6 +236,7 @@ BuildRequires:  python3-tox-current-env
 %if 0%{?suse_version} == 1500
 %patch -P 103 -p1
 %patch -P 104 -p0
+%patch -P 105 -p1
 %endif
 
 cp %SOURCE1 tools/cockpit.pam
@@ -306,6 +308,12 @@ cp src/fonts.css %{buildroot}%{_datadir}/cockpit/branding/suse
 cp -a src/fonts %{buildroot}%{_datadir}/cockpit/branding/suse
 popd
 
+%if 0%{?suse_version} == 1500
+sed -i -e 's#"/lib/systemd/system#"%{_unitdir}#' \
+  %{buildroot}%{_datadir}/cockpit/packagekit/manifest.json \
+  %{buildroot}%{_datadir}/cockpit/pcp/manifest.json
+%endif
+
 # Build the package lists for resource packages
 # cockpit-bridge is the basic dependency for all cockpit-* packages, so centrally own the page directory
 echo '%dir %{_datadir}/cockpit' > base.list
@@ -558,7 +566,6 @@ Suggests: sssd-dbus >= 2.6.2
 %if 0%{?suse_version}
 Requires(pre): permissions
 Requires: distribution-logos
-Requires: pam_oath
 Requires: wallpaper-branding
 %endif
 # for cockpit-desktop

fix-libexecdir.patch

@@ -0,0 +1,12 @@
+diff -up cockpit-320/src/cockpit/packages.py.org cockpit-320/src/cockpit/packages.py
+--- cockpit-320/src/cockpit/packages.py.org	2024-07-14 21:06:50.378400822 +0200
++++ cockpit-320/src/cockpit/packages.py	2024-07-14 21:07:40.568245119 +0200
+@@ -127,7 +127,7 @@ def get_libexecdir() -> str:
+ 
+     This only works for systems which have cockpit-ws installed.
+     """
+-    for candidate in ['/usr/local/libexec', '/usr/libexec', '/usr/local/lib/cockpit', '/usr/lib/cockpit']:
++    for candidate in ['/usr/local/libexec', '/usr/libexec', '/usr/local/lib/cockpit', '/usr/lib/cockpit', '/usr/lib']:
+         if os.path.exists(os.path.join(candidate, 'cockpit-askpass')):
+             return candidate
+     else: