- Merge SUSE branding into cockpit package

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=108
This commit is contained in:
Adam Majer 2022-09-13 16:16:08 +00:00 committed by Git OBS Bridge
parent 37d2d8ad70
commit 3d55c61c7d
6 changed files with 37 additions and 2 deletions

View File

@ -1,4 +1,19 @@
<services>
<service name="obs_scm" mode="manual">
<param name="url">https://github.com/dgdavid/cockpit-suse-theme.git</param>
<param name="versionformat">%h</param>
<param name="scm">git</param>
<param name="revision">main</param>
</service>
<service mode="buildtime" name="tar">
<param name="obsinfo">cockpit-suse-theme.obsinfo</param>
</service>
<service mode="buildtime" name="set_version">
<param name="basename">cockpit-suse-theme</param>
<param name="file">cockpit-suse-these.tar</param>
</service>
<service name="obs_scm" mode="manual">
<param name="versionformat">@PARENT_TAG@</param>
<param name="url">http://github.com/cockpit-project/cockpit.git</param>
@ -17,4 +32,6 @@
<service mode="buildtime" name="set_version">
<param name="basename">cockpit</param>
</service>
</services>

View File

@ -1,4 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">http://github.com/cockpit-project/cockpit.git</param>
<param name="changesrevision">046b3d4b381cd60f9d44756fc51f15ed7e17d0b5</param></service></servicedata>
<param name="changesrevision">046b3d4b381cd60f9d44756fc51f15ed7e17d0b5</param></service><service name="tar_scm">
<param name="url">https://github.com/dgdavid/cockpit-suse-theme.git</param>
<param name="changesrevision">fe08b35e64ad45f4b56cd636fdfec8fb18d69ab7</param></service></servicedata>

BIN
cockpit-suse-theme-fe08b35.obscpio (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,4 @@
name: cockpit-suse-theme
version: fe08b35
mtime: 1655379139
commit: fe08b35e64ad45f4b56cd636fdfec8fb18d69ab7

View File

@ -2,6 +2,7 @@
Tue Sep 13 09:46:17 UTC 2022 - Adam Majer <adam.majer@suse.de>
- Fix cockpit-storage dependencies
- Merge SUSE branding into cockpit package
-------------------------------------------------------------------
Mon Sep 5 08:09:56 UTC 2022 - Jacek Tomasiak <jtomasiak@suse.com>

View File

@ -55,6 +55,7 @@ Release: 0
Source0: cockpit-%{version}.tar
Source1: cockpit.pam
Source2: cockpit-rpmlintrc
Source3: cockpit-suse-theme-fe08b35.tar
Source99: README.packaging
Source98: package-lock.json
Source97: node_modules.spec.inc
@ -182,7 +183,7 @@ Requires: subscription-manager-cockpit
%endif
%prep
%setup -q -n cockpit-%{version}
%setup -q -n cockpit-%{version} -a 3
%patch1 -p1
%patch2 -p1
%patch3 -p1
@ -236,6 +237,13 @@ install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit
rm -f %{buildroot}/%{_libdir}/cockpit/*.so
install -D -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/
mkdir -p %{buildroot}%{_datadir}/cockpit/branding/suse
pushd cockpit-suse-theme-*
cp src/css-overrides.css %{buildroot}%{_datadir}/cockpit/branding/suse
cp src/fonts.css %{buildroot}%{_datadir}/cockpit/branding/suse
cp -a src/fonts %{buildroot}%{_datadir}/cockpit/branding/suse
popd
# only ship deprecated PatternFly API for stable releases
%if 0%{?rhel} == 8
if [ -f %{buildroot}/%{_datadir}/cockpit/base1/cockpit.css.gz ]; then