Accepting request 983884 from systemsmanagement:cockpit
- Re-arrange patches and apply them manually again. Some were accidentally added and should be sle only OBS-URL: https://build.opensuse.org/request/show/983884 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cockpit?expand=0&rev=20
This commit is contained in:
commit
0b0d43183b
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 20 08:15:34 UTC 2022 - Adam Majer <adam.majer@suse.de>
|
||||||
|
|
||||||
|
- 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 <adam.majer@suse.de>
|
Fri Jun 17 10:09:09 UTC 2022 - Adam Majer <adam.majer@suse.de>
|
||||||
|
|
||||||
|
13
cockpit.spec
13
cockpit.spec
@ -62,10 +62,10 @@ Source97: node_modules.spec.inc
|
|||||||
Patch1: 0001-selinux-allow-login-to-read-motd-file.patch
|
Patch1: 0001-selinux-allow-login-to-read-motd-file.patch
|
||||||
Patch2: hide-docs.patch
|
Patch2: hide-docs.patch
|
||||||
Patch3: suse-microos-branding.patch
|
Patch3: suse-microos-branding.patch
|
||||||
|
Patch4: css-overrides.patch
|
||||||
# SLE Micro specific patches
|
# SLE Micro specific patches
|
||||||
Patch100: remove-pwscore.patch
|
Patch100: remove-pwscore.patch
|
||||||
Patch101: hide-pcp.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})
|
# 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})
|
# and cockpit-appstream (building optional packages like cockpit-{pcp})
|
||||||
@ -178,7 +178,16 @@ Requires: subscription-manager-cockpit
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%prep
|
%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
|
cp %SOURCE1 tools/cockpit.pam
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user