From 0ed6fb0b0325b0a05de6949b322ef144ccc83eff4beb6c9bd645dbb42e93d6c2 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Sun, 2 Feb 2020 19:26:07 +0000 Subject: [PATCH] Accepting request 767929 from home:hellcp:branches:mozilla:Factory - Use a symbolic icon from branding internals - Pixmaps no longer required for the desktops OBS-URL: https://build.opensuse.org/request/show/767929 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=800 --- MozillaFirefox.changes | 6 ++++++ MozillaFirefox.spec | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 7f3e3dd..5511584 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 28 07:30:16 UTC 2020 - Stasiek Michalski + +- Use a symbolic icon from branding internals +- Pixmaps no longer required for the desktops + ------------------------------------------------------------------- Wed Jan 22 10:30:21 UTC 2020 - Wolfgang Rosenauer diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index c2cc770..0caa8a7 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -576,10 +576,11 @@ cp %{SOURCE11} %{buildroot}%{_mandir}/man1/%{progname}.1 # mkdir -p %{buildroot}%{_datadir}/mozilla/extensions/%{firefox_appid} mkdir -p %{buildroot}%{_libdir}/mozilla/extensions/%{firefox_appid} -mkdir -p %{buildroot}/usr/share/pixmaps/ -ln -sf %{progdir}/browser/chrome/icons/default/default128.png %{buildroot}/usr/share/pixmaps/%{progname}.png -ln -sf %{progdir}/browser/chrome/icons/default/default128.png %{buildroot}/usr/share/pixmaps/%{progname}-gnome.png %if %branding +# Install symbolic icon for GNOME +mkdir -p %{buildroot}%{gnome_dir}/share/icons/hicolor/symbolic/apps/ +cp %{_builddir}/%{srcname}-%{orig_version}/browser/branding/official/content/identity-icons-brand.svg \ + %{buildroot}%{gnome_dir}/share/icons/hicolor/symbolic/apps/%{progname}-symbolic.svg for size in 16 22 24 32 48 64 128 256; do %else for size in 16 32 48; do @@ -693,7 +694,6 @@ exit 0 %endif %{_datadir}/applications/%{desktop_file_name}.desktop %{_datadir}/mime/packages/%{progname}.xml -%{_datadir}/pixmaps/firefox* %dir %{_datadir}/mozilla %dir %{_datadir}/mozilla/extensions %dir %{_datadir}/mozilla/extensions/%{firefox_appid}