From 7e8b1a11d6de7f98c80715e3f239493209cc304899ac2e7738e0a659b3a6db44 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 29 Sep 2014 08:43:45 +0000 Subject: [PATCH] - Do not obsolete gnome-icon-theme, gnome-icon-theme-extras and gnome-icon-theme-symbolic: a lot of non-GNOME package depend more or less correct on those theme names, mostly to 'cheat' and not having to bring own icon themes. OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/adwaita-icon-theme?expand=0&rev=5 --- adwaita-icon-theme.changes | 8 ++++++++ adwaita-icon-theme.spec | 8 ++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/adwaita-icon-theme.changes b/adwaita-icon-theme.changes index 13efeb2..0a26965 100644 --- a/adwaita-icon-theme.changes +++ b/adwaita-icon-theme.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Sep 29 08:43:19 UTC 2014 - dimstar@opensuse.org + +- Do not obsolete gnome-icon-theme, gnome-icon-theme-extras and + gnome-icon-theme-symbolic: a lot of non-GNOME package depend more + or less correct on those theme names, mostly to 'cheat' and not + having to bring own icon themes. + ------------------------------------------------------------------- Tue Sep 23 08:30:13 UTC 2014 - zaitor@opensuse.org diff --git a/adwaita-icon-theme.spec b/adwaita-icon-theme.spec index aac182e..b42b1d7 100644 --- a/adwaita-icon-theme.spec +++ b/adwaita-icon-theme.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-icon-theme +# spec file for package adwaita-icon-theme # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -34,10 +34,6 @@ Requires(post): gtk3-tools Provides: %{name}-devel = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -# gnome-icon-theme, gnome-icon-theme-extras and gnome-icon-theme-symbolic were merged at 3.13.1 and renamed to adwaita-icon-theme -Obsoletes: gnome-icon-theme < 3.13 -Obsoletes: gnome-icon-theme-extras < 3.13 -Obsoletes: gnome-icon-theme-symbolic < 3.13 %description The default GNOME icon theme, Adwaita. @@ -63,7 +59,7 @@ mkdir -p %{buildroot}%{_datadir}/icons/Adwaita/scalable/mimetypes mkdir -p %{buildroot}%{_datadir}/icons/Adwaita/scalable/places mkdir -p %{buildroot}%{_datadir}/icons/Adwaita/scalable/status mkdir -p %{buildroot}%{_datadir}/icons/Adwaita/scalable/stock/generic -# Add internet-web-browser symling (to web-browser) to gnome-icon-theme (bnc#767437) +# Add internet-web-browser symling (to web-browser) to adwaita-icon-theme (bnc#767437) for folder in %{buildroot}%{_datadir}/icons/Adwaita/*x[0-9]*; do ln ${folder}/apps/web-browser.png ${folder}/apps/internet-web-browser.png || : done