From 9192f7048502b085d92b115daa0a64028f5be70b0b5fab8e5336271a53e725c1 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Tue, 17 May 2016 06:38:09 +0000 Subject: [PATCH] Accepting request 395139 from home:dimstar:Factory - Copy the icons to /usr/share/icons instead of symlinking them: in preparation for containerized apps (e.g. xdg-app) as well as AppStream metadata extraction, there are a couple locations that need to be real files for system integration (.desktop files, icons, mime-type info). - The exact same fix was done in MozillaFirefox in March 2015 OBS-URL: https://build.opensuse.org/request/show/395139 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=316 --- MozillaThunderbird.changes | 9 +++++++++ MozillaThunderbird.spec | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 17b08d8..9b794a7 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu May 12 15:21:45 UTC 2016 - dimstar@opensuse.org + +- Copy the icons to /usr/share/icons instead of symlinking them: + in preparation for containerized apps (e.g. xdg-app) as well as + AppStream metadata extraction, there are a couple locations that + need to be real files for system integration (.desktop files, + icons, mime-type info). + ------------------------------------------------------------------- Sat May 7 22:19:09 UTC 2016 - wr@rosenauer.org diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index 3511553..ff222af 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -414,7 +414,8 @@ find $RPM_BUILD_ROOT%{progdir} -name ".mkdir.done" | xargs rm # for size in 16 22 24 32 48 256; do mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/ - ln -sf %{progdir}/chrome/icons/default/default$size.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/%{progname}.png + cp %{buildroot}%{progdir}/chrome/icons/default/default$size.png \ + %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/%{progname}.png done %suse_update_desktop_file %{desktop_file_name} Network Email GTK # excluded files