Accepting request 1143446 from home:lkocman:branches:Base:System

- list the source url

- Update Leap 15.6 branding poo#131666

- Initial Leap Micro 5.2 branding

OBS-URL: https://build.opensuse.org/request/show/1143446
OBS-URL: https://build.opensuse.org/package/show/Base:System/distribution-logos-openSUSE?expand=0&rev=24

distribution-logos-main.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:387cc44a06caf23041a05c28420fd000a533e9e1107eaa635f3bd20d0d309717
-size 110227

distribution-logos-openSUSE-20240201.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ca11b5d7d453a5d1b241d3798375efc11fec2e6cb335488fa0a1869eb1ba9556
+size 114865

distribution-logos-openSUSE.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Feb  1 14:45:43 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- list the source url
+
+-------------------------------------------------------------------
+Thu Feb  1 10:15:48 UTC 2024 - Lubos Kocman <lubos.kocman@suse.com>
+
+- Update Leap 15.6 branding poo#131666
+
+
 -------------------------------------------------------------------
 Thu Sep 21 17:54:52 UTC 2023 - Jacob Michalskie <hel@lcp.world>
 

distribution-logos-openSUSE.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package distribution-logos-openSUSE
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2024 SUSE LLC
 # Copyright (c) 2021 Sasi Olin <hellcp@opensuse.org>.
 #
 # All modifications and additions to the file contributed by third parties
@@ -18,29 +18,26 @@
 
 
 Name:           distribution-logos-openSUSE
+Version:        20240201
+Release:        0
 Summary:        Logos for openSUSE Distros
 License:        CC-BY-SA-4.0
-Version:        20230921
+URL:            https://github.com/openSUSE/distribution-logos
-Release:        0
+Source:         https://github.com/openSUSE/distribution-logos/archive/refs/heads/main.zip#/distribution-logos-openSUSE-%{version}.zip
-Url:            https://github.com/openSUSE/distribution-logos
-Source:         distribution-logos-main.zip
-BuildRequires:  unzip
 BuildRequires:  hicolor-icon-theme
+BuildRequires:  unzip
 BuildArch:      noarch
 
 %description
 Logos for openSUSE Distributions
 
 %if 0%{?sle_version}
-
 %package Leap
 Summary:        Logos for openSUSE Leap
-
+Conflicts:      distribution-logos
 Obsoletes:      distribution-logos
 Provides:       distribution-logos
-Conflicts:      distribution-logos
+Removepathpostfixes:.Leap
-
-RemovePathPostfixes: .Leap
 BuildArch:      noarch
 
 %description Leap
@@ -48,12 +45,10 @@ Logos for openSUSE Leap
 
 %package LeapMicro
 Summary:        Logos for openSUSE Leap Micro
-
+Conflicts:      distribution-logos
 Obsoletes:      distribution-logos
 Provides:       distribution-logos
-Conflicts:      distribution-logos
+Removepathpostfixes:.LeapMicro
-
-RemovePathPostfixes: .LeapMicro
 BuildArch:      noarch
 
 %description LeapMicro
@@ -63,12 +58,10 @@ Logos for openSUSE Leap Micro
 
 %package Tumbleweed
 Summary:        Logos for openSUSE Tumbleweed
-
+Conflicts:      distribution-logos
 Obsoletes:      distribution-logos
 Provides:       distribution-logos
-Conflicts:      distribution-logos
+Removepathpostfixes:.Tumbleweed
-
-RemovePathPostfixes: .Tumbleweed
 BuildArch:      noarch
 
 %description Tumbleweed
@@ -76,12 +69,10 @@ Logos for openSUSE Tumbleweed
 
 %package Kubic
 Summary:        Logos for openSUSE Kubic
-
+Conflicts:      distribution-logos
 Obsoletes:      distribution-logos
 Provides:       distribution-logos
-Conflicts:      distribution-logos
+Removepathpostfixes:.Kubic
-
-RemovePathPostfixes: .Kubic
 BuildArch:      noarch
 
 %description Kubic
@@ -89,12 +80,10 @@ Logos for openSUSE Kubic
 
 %package MicroOS
 Summary:        Logos for openSUSE MicroOS
-
+Conflicts:      distribution-logos
 Obsoletes:      distribution-logos
 Provides:       distribution-logos
-Conflicts:      distribution-logos
+Removepathpostfixes:.MicroOS
-
-RemovePathPostfixes: .MicroOS
 BuildArch:      noarch
 
 %description MicroOS
@@ -102,12 +91,10 @@ Logos for openSUSE MicroOS
 
 %package Aeon
 Summary:        Logos for openSUSE Aeon
-
+Conflicts:      distribution-logos
 Obsoletes:      distribution-logos
 Provides:       distribution-logos
-Conflicts:      distribution-logos
+Removepathpostfixes:.Aeon
-
-RemovePathPostfixes: .Aeon
 BuildArch:      noarch
 
 %description Aeon
@@ -117,20 +104,18 @@ Logos for openSUSE Aeon
 
 %package icons
 Summary:        Icons with distribution logos
-
 Requires:       distribution-logos
+Conflicts:      systemd-icon-branding-openSUSE
 Provides:       systemd-icon-branding
 Obsoletes:      systemd-icon-branding-openSUSE < 84.87.20210910
 Provides:       systemd-icon-branding-openSUSE = 84.87.20210910
-Conflicts:      systemd-icon-branding-openSUSE
-
 BuildArch:      noarch
 
 %description icons
 Icons with openSUSE distribution logos.
 
 %prep
-%setup -qn distribution-logos-main
+%setup -q -n distribution-logos-main
 
 %build
 # Skip build
@@ -157,7 +142,6 @@ ln -sf %{_datadir}/pixmaps/distribution-logos/square-symbolic.svg %{buildroot}%{
 %dir %{_datadir}/pixmaps/distribution-logos
 
 %if 0%{?sle_version}
-
 %files Leap
 %{_datadir}/pixmaps/distribution-logos/*.Leap