- install hicolor icons instead of pixmaps. see http://crbug.com/110339

Changed files:
    chromium-browser.spec -> 1.172

diff --git a/chromium-browser.spec b/chromium-browser.spec
index cb6dc0588543fbf096ad3cc8935b5a709b631156..c08e07e063f227d802503be814ee0f87daab057c 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -93,6 +93,7 @@ BuildRequires:        glib2-devel
 BuildRequires: gperf
 BuildRequires: gtk+2-devel
 %{?with_kerberos:BuildRequires:        heimdal-devel}
+BuildRequires: hicolor-icon-theme
 BuildRequires: libevent-devel
 %{?with_keyring:BuildRequires: libgnome-keyring-devel}
 BuildRequires: libicu-devel >= 4.6
@@ -133,6 +134,7 @@ BuildRequires:      xz
 %{?with_system_zlib:BuildRequires:     zlib-devel}
 Requires:      browser-plugins >= 2.0
 Requires:      desktop-file-utils
+Requires:      hicolor-icon-theme
 %{?with_system_vpx:Requires:   libvpx >= 0.9.5-2}
 Requires:      xdg-utils >= 1.0.2-4
 Provides:      wwwbrowser
@@ -282,7 +284,7 @@ test -e Makefile || %{__python} build/gyp_chromium --format=make build/all.gyp \
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/{themes,plugins,extensions} \
-       $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_pixmapsdir},%{_desktopdir}}
+       $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_desktopdir}}
 
 cd src/out/%{!?debug:Release}%{?debug:Debug}
 install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}
@@ -310,7 +312,17 @@ install -p nacl_irt_x86_32.nexe $RPM_BUILD_ROOT%{_libdir}/%{name}
 
 cd -
 
-cp -p src/chrome/app/theme/chromium/product_logo_48.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+for icon in src/chrome/app/theme/chromium/product_logo_[0-9]*.png; do
+       size=${icon##*/product_logo_}
+       size=${size%.png}
+
+       # this will skip non-numeric (22_mono_invert, 22_mono)
+       dir=%{_iconsdir}/hicolor/${size}x${size}/apps
+       test -d "$dir" || continue
+
+       install -d $RPM_BUILD_ROOT$dir
+       cp -p $icon $RPM_BUILD_ROOT$dir/%{name}.png
+done
 
 %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins -b <<'EOF'
 # http://code.google.com/p/chromium/issues/detail?id=24507
@@ -326,11 +338,13 @@ EOF
 rm -rf $RPM_BUILD_ROOT
 
 %post
+%update_icon_cache hicolor
 %update_desktop_database
 %update_browser_plugins
 
 %postun
 if [ "$1" = 0 ]; then
+       %update_icon_cache hicolor
        %update_browser_plugins
 fi
 
@@ -340,8 +354,8 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
 %attr(755,root,root) %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
-%{_pixmapsdir}/%{name}.png
 %{_desktopdir}/*.desktop
+%{_iconsdir}/hicolor/*/apps/%{name}.png
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/chrome.pak
 %{_libdir}/%{name}/content_resources.pak