From 745fa77eb313a852995b34aed177a7e19f3e6da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 12 Sep 2024 15:41:27 +0200 Subject: [PATCH] Import the changes from the OBS SLE15-SP6 project --- package/yast2-theme.changes | 4 ++-- package/yast2-theme.spec | 23 ++++++++++++----------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/package/yast2-theme.changes b/package/yast2-theme.changes index 5937c1b9..68a45d93 100644 --- a/package/yast2-theme.changes +++ b/package/yast2-theme.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Fri Sep 01 19:57:03 UTC 2023 - Josef Reidinger +Fri Mar 03 14:44:07 UTC 2023 - Ladislav Slezák -- Branch package for SP6 (bsc#1208913) +- Bump version to 4.6.0 (bsc#1208913) ------------------------------------------------------------------- Wed Apr 06 13:24:58 UTC 2022 - Ladislav Slezák diff --git a/package/yast2-theme.spec b/package/yast2-theme.spec index de0ce473..e38baed6 100644 --- a/package/yast2-theme.spec +++ b/package/yast2-theme.spec @@ -1,7 +1,7 @@ # # spec file for package yast2-theme # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,9 +12,10 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: yast2-theme Version: 4.6.0 Release: 0 @@ -28,10 +29,10 @@ BuildRequires: update-desktop-files BuildRequires: yast2-devtools BuildRequires: rubygem(%{rb_default_ruby_abi}:yast-rake) %if 0%{?is_opensuse} -BuildRequires: yast2-qt-branding -BuildRequires: oxygen5-icon-theme BuildRequires: breeze5-icons +BuildRequires: oxygen5-icon-theme BuildRequires: update-desktop-files +BuildRequires: yast2-qt-branding %endif Requires: hicolor-icon-theme @@ -51,17 +52,17 @@ Conflicts: yast2-qt-branding-openSUSE # Since yast2-branding is provided by this package, OBS needs some help to bootstrap #!BuildIgnore: yast2-branding Provides: yast2-branding = %{version} -Provides: yast2_theme = %{version} Provides: yast2-theme = %{version} +Provides: yast2_theme = %{version} Conflicts: otherproviders(yast2-branding) Conflicts: otherproviders(yast2-theme) Conflicts: otherproviders(yast2_theme) -Obsoletes: yast2-theme-openSUSE -Obsoletes: yast2-theme-SLE -Obsoletes: yast2-theme < %{version} Obsoletes: yast2-branding-openSUSE +Obsoletes: yast2-theme < %{version} +Obsoletes: yast2-theme-SLE +Obsoletes: yast2-theme-openSUSE Obsoletes: yast2-theme-openSUSE-Crystal < %{version} BuildArch: noarch @@ -70,9 +71,9 @@ Summary: YaST2 - Theme # icons/**/pattern-deepin.svg is GPL-3.0, # pattern-budgie.svg is licensed under CC-BY-SA-4.0 # the rest is GPL-2.0 -License: GPL-2.0 AND GPL-3.0 AND CC-BY-SA-4.0 +License: CC-BY-SA-4.0 AND GPL-2.0-only AND GPL-3.0-only Group: System/YaST -Url: http://github.com/yast/yast-theme +URL: http://github.com/yast/yast-theme %description Contains necessary theming resources to use YaST2. @@ -85,8 +86,8 @@ Supplements: (yast2-theme and oxygen5-icon-theme) PreReq: yast2-branding = %{version} Requires: oxygen5-icon-theme Provides: yast2-theme-oxygen = %{version} -Obsoletes: yast2-theme-oxygen < %{version} Obsoletes: yast2-theme-openSUSE-Oxygen < %{version} +Obsoletes: yast2-theme-oxygen < %{version} %description oxygen Contains icons in KDE Oxygen style (from KDE Plasma 4).