From ffccacefc1c7daeec1bdaa850b66b4bed5b9eb225de5d834043718ea3712d345 Mon Sep 17 00:00:00 2001 From: Sasi Olin Date: Sat, 2 Jan 2021 11:10:22 +0000 Subject: [PATCH] Accepting request 859828 from home:hellcp:branches:Base:System - Only build Leap subpackage on Leap base and Tumbleweed based distros subpackages on Tumbleweed base OBS-URL: https://build.opensuse.org/request/show/859828 OBS-URL: https://build.opensuse.org/package/show/Base:System/distribution-logos-openSUSE?expand=0&rev=9 --- distribution-logos-openSUSE.changes | 6 ++++++ distribution-logos-openSUSE.spec | 18 +++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/distribution-logos-openSUSE.changes b/distribution-logos-openSUSE.changes index 5f8819a..0077be1 100644 --- a/distribution-logos-openSUSE.changes +++ b/distribution-logos-openSUSE.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jan 2 11:06:52 UTC 2021 - Stasiek Michalski + +- Only build Leap subpackage on Leap base and Tumbleweed based + distros subpackages on Tumbleweed base + ------------------------------------------------------------------- Tue Nov 17 12:21:00 UTC 2020 - Stasiek Michalski diff --git a/distribution-logos-openSUSE.spec b/distribution-logos-openSUSE.spec index 11639e1..274434e 100644 --- a/distribution-logos-openSUSE.spec +++ b/distribution-logos-openSUSE.spec @@ -30,6 +30,8 @@ BuildArch: noarch %description Logos for openSUSE Distributions +%if 0%{?sle_version} + %package Leap Summary: Logos for openSUSE Leap @@ -43,6 +45,8 @@ BuildArch: noarch %description Leap Logos for openSUSE Leap +%else + %package Tumbleweed Summary: Logos for openSUSE Tumbleweed @@ -82,6 +86,8 @@ BuildArch: noarch %description MicroOS Logos for openSUSE MicroOS +%endif + %prep %setup -qn distribution-logos-master @@ -89,7 +95,11 @@ Logos for openSUSE MicroOS # Skip build %install -for distro in Leap Tumbleweed Kubic MicroOS; do \ +%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}; \ @@ -99,9 +109,13 @@ done \ %files %dir %{_datadir}/pixmaps/distribution-logos +%if 0%{?sle_version} + %files Leap %{_datadir}/pixmaps/distribution-logos/*.Leap +%else + %files Tumbleweed %{_datadir}/pixmaps/distribution-logos/*.Tumbleweed @@ -111,4 +125,6 @@ done \ %files MicroOS %{_datadir}/pixmaps/distribution-logos/*.MicroOS +%endif + %changelog