From 2533bb2a341421f335d36c6923eb2f76b3b452ae53369992ca015e72ecdab335 Mon Sep 17 00:00:00 2001 From: Sasi Olin Date: Sun, 6 Jun 2021 16:38:13 +0000 Subject: [PATCH] Accepting request 897883 from home:hellcp:branches:Base:System - Add icons package to handle systemd branding better OBS-URL: https://build.opensuse.org/request/show/897883 OBS-URL: https://build.opensuse.org/package/show/Base:System/distribution-logos-openSUSE?expand=0&rev=11 --- distribution-logos-openSUSE.changes | 5 +++++ distribution-logos-openSUSE.spec | 30 ++++++++++++++++++++++++++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/distribution-logos-openSUSE.changes b/distribution-logos-openSUSE.changes index 0077be1..3b8db01 100644 --- a/distribution-logos-openSUSE.changes +++ b/distribution-logos-openSUSE.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jun 6 16:37:14 UTC 2021 - Sasi Olin + +- Add icons package to handle systemd branding better + ------------------------------------------------------------------- Sat Jan 2 11:06:52 UTC 2021 - Stasiek Michalski diff --git a/distribution-logos-openSUSE.spec b/distribution-logos-openSUSE.spec index 274434e..c9a95ed 100644 --- a/distribution-logos-openSUSE.spec +++ b/distribution-logos-openSUSE.spec @@ -2,7 +2,7 @@ # spec file for package distribution-logos-openSUSE # # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2020 Stasiek Michalski . +# Copyright (c) 2021 Sasi Olin . # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,7 @@ Release: 0 Url: https://github.com/openSUSE/distribution-logos Source: distribution-logos-master.zip BuildRequires: unzip +BuildRequires: hicolor-icon-theme BuildArch: noarch %description @@ -88,6 +89,20 @@ Logos for openSUSE MicroOS %endif +%package icons +Summary: Icons with distribution logos + +Requires: distribution-logos +Provides: systemd-icon-branding +Obsoletes: systemd-icon-branding-openSUSE < 20200107 +Provides: systemd-icon-branding-openSUSE = 20200107 +Conflicts: systemd-icon-branding-openSUSE + +BuildArch: noarch + +%description icons +Icons with openSUSE distribution logos. + %prep %setup -qn distribution-logos-master @@ -95,16 +110,22 @@ Logos for openSUSE MicroOS # Skip build %install +export NO_BRP_STALE_LINK_ERROR=yes +mkdir -p %{buildroot}%{_datadir}/pixmaps/distribution-logos +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{scalable,symbolic}/apps %if 0%{?sle_version} for distro in Leap; do \ %else for distro in Tumbleweed Kubic MicroOS; do \ %endif -mkdir -p %{buildroot}%{_datadir}/pixmaps/distribution-logos; \ for file in `ls ${distro}`; do \ cp -r ${distro}/${file} %{buildroot}%{_datadir}/pixmaps/distribution-logos/${file}.${distro}; \ done; \ -done \ +cp -r ${distro}/square-hicolor.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/distributor-logo-${distro}.svg; \ +cp -r ${distro}/square-symbolic.svg %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps/distributor-logo-${distro}-symbolic.svg; \ +done +ln -sf %{_datadir}/pixmaps/distribution-logos/square-hicolor.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/distributor-logo.svg +ln -sf %{_datadir}/pixmaps/distribution-logos/square-symbolic.svg %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps/distributor-logo-symbolic.svg %files %dir %{_datadir}/pixmaps/distribution-logos @@ -127,4 +148,7 @@ done \ %endif +%files icons +%{_datadir}/icons/hicolor/* + %changelog