From be8513bba805264987ce3188aaf93b4a08559eafff50e54141998bc8e0903396 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Mon, 20 Jun 2022 08:15:26 +0000 Subject: [PATCH 1/2] Re-arrange patches some were accidentally added and should be sle only OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=96 --- cockpit.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/cockpit.spec b/cockpit.spec index 87b8f8b..c5744ea 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -62,10 +62,10 @@ Source97: node_modules.spec.inc Patch1: 0001-selinux-allow-login-to-read-motd-file.patch Patch2: hide-docs.patch Patch3: suse-microos-branding.patch +Patch4: css-overrides.patch # SLE Micro specific patches Patch100: remove-pwscore.patch Patch101: hide-pcp.patch -Patch102: css-overrides.patch # in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system}) # and cockpit-appstream (building optional packages like cockpit-{pcp}) @@ -178,7 +178,16 @@ Requires: subscription-manager-cockpit %endif %prep -%autosetup -p1 -n cockpit-%{version} +%setup -q -n cockpit-%{version} +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 + +%if 0%{?sle_version} +%patch100 -p1 +%patch101 -p1 +%endif cp %SOURCE1 tools/cockpit.pam # From 67ed0d9ac731d8e62791264da09a6d020096aa6eccca977ab0c07420fe814e7f Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Mon, 20 Jun 2022 08:16:13 +0000 Subject: [PATCH 2/2] - Re-arrange patches and apply them manually again. Some were accidentally added and should be sle only OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=97 --- cockpit.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cockpit.changes b/cockpit.changes index cb52e32..16b73d8 100644 --- a/cockpit.changes +++ b/cockpit.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 20 08:15:34 UTC 2022 - Adam Majer + +- Re-arrange patches and apply them manually again. + Some were accidentally added and should be sle only + ------------------------------------------------------------------- Fri Jun 17 10:09:09 UTC 2022 - Adam Majer