abrooks/cockpit
SHA256
1
0
Fork 0
forked from cockpit/cockpit
Code Pull Requests Activity

- Fix libexecdir for leap and sle (bsc#1223533)

Browse Source 
- Fix systemd units folder for leap and sle (bsc#1226541)

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=192
This commit is contained in:
Adam Majer 2024-08-08 10:48:31 +00:00 committed by Git OBS Bridge
parent 3d9fd349c1
commit 08a644cfac
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cockpit.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 7 20:25:34 UTC 2024 - Herbert Graeber <herbert@graeber-clan.de>
- Fix libexecdir for leap and sle (bsc#1223533)
- Fix systemd units folder for leap and sle (bsc#1226541)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 7 09:36:58 UTC 2024 - Jan Zerebecki <jan.suse@zerebecki.de> Wed Aug 7 09:36:58 UTC 2024 - Jan Zerebecki <jan.suse@zerebecki.de>

8
cockpit.spec
View File

@ -72,6 +72,7 @@ Patch102: 0002-selinux-temporary-remove-setroubleshoot-section.patch
# For anything based on SLES 15 codebase (including Leap, SLE Micro) # For anything based on SLES 15 codebase (including Leap, SLE Micro)
Patch103: 0004-leap-gnu18-removal.patch Patch103: 0004-leap-gnu18-removal.patch
Patch104: selinux_libdir.patch Patch104: selinux_libdir.patch
Patch105: fix-libexecdir.patch
%define build_all 1 %define build_all 1
%if 0%{?rhel} == 8 && 0%{?epel} == 0 && !0%{?build_all} %if 0%{?rhel} == 8 && 0%{?epel} == 0 && !0%{?build_all}
@ -235,6 +236,7 @@ BuildRequires: python3-tox-current-env
%if 0%{?suse_version} == 1500 %if 0%{?suse_version} == 1500
%patch -P 103 -p1 %patch -P 103 -p1
%patch -P 104 -p0 %patch -P 104 -p0
%patch -P 105 -p1
%endif %endif
cp %SOURCE1 tools/cockpit.pam 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 cp -a src/fonts %{buildroot}%{_datadir}/cockpit/branding/suse
popd 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 # Build the package lists for resource packages
# cockpit-bridge is the basic dependency for all cockpit-* packages, so centrally own the page directory # cockpit-bridge is the basic dependency for all cockpit-* packages, so centrally own the page directory
echo '%dir %{_datadir}/cockpit' > base.list echo '%dir %{_datadir}/cockpit' > base.list

12
fix-libexecdir.patch Normal file
View File

@ -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: