From 3d55c61c7d59363517a1b0e46a7864a6752a7487186f6f60e6553199677cf6e1 Mon Sep 17 00:00:00 2001
From: Adam Majer <amajer@suse.com>
Date: Tue, 13 Sep 2022 16:16:08 +0000
Subject: [PATCH] - Merge SUSE branding into cockpit package

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=108
---
 _service                           | 17 +++++++++++++++++
 _servicedata                       |  4 +++-
 cockpit-suse-theme-fe08b35.obscpio |  3 +++
 cockpit-suse-theme.obsinfo         |  4 ++++
 cockpit.changes                    |  1 +
 cockpit.spec                       | 10 +++++++++-
 6 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 cockpit-suse-theme-fe08b35.obscpio
 create mode 100644 cockpit-suse-theme.obsinfo

diff --git a/_service b/_service
index f804a83..81f03c0 100644
--- a/_service
+++ b/_service
@@ -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>
diff --git a/_servicedata b/_servicedata
index 5065ec3..4a037d0 100644
--- a/_servicedata
+++ b/_servicedata
@@ -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>
\ No newline at end of file
+              <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>
\ No newline at end of file
diff --git a/cockpit-suse-theme-fe08b35.obscpio b/cockpit-suse-theme-fe08b35.obscpio
new file mode 100644
index 0000000..075cce0
--- /dev/null
+++ b/cockpit-suse-theme-fe08b35.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc2c191f02147e115fd4bc3bd804b3625c68be495fd789ff5a10236e3796b10f
+size 1276428
diff --git a/cockpit-suse-theme.obsinfo b/cockpit-suse-theme.obsinfo
new file mode 100644
index 0000000..39714c9
--- /dev/null
+++ b/cockpit-suse-theme.obsinfo
@@ -0,0 +1,4 @@
+name: cockpit-suse-theme
+version: fe08b35
+mtime: 1655379139
+commit: fe08b35e64ad45f4b56cd636fdfec8fb18d69ab7
diff --git a/cockpit.changes b/cockpit.changes
index ae7dcf5..4a76e4e 100644
--- a/cockpit.changes
+++ b/cockpit.changes
@@ -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>
diff --git a/cockpit.spec b/cockpit.spec
index bb8eb90..87cf8ca 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -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