Author: glen Date: Wed Jan 18 09:44:19 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- install hicolor icons instead of pixmaps. see http://crbug.com/110339
---- Files affected:
packages/chromium-browser:
chromium-browser.spec (1.171 -> 1.172)
---- Diffs:
================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.171
packages/chromium-browser/chromium-browser.spec:1.172
--- packages/chromium-browser/chromium-browser.spec:1.171 Sun Jan 15
22:31:41 2012
+++ packages/chromium-browser/chromium-browser.spec Wed Jan 18 10:44:13 2012
@@ -94,6 +94,7 @@
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
@@ -134,6 +135,7 @@
%{?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
@@ -283,7 +285,7 @@
%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}
@@ -311,7 +313,17 @@
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
@@ -327,11 +339,13 @@
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
@@ -341,8 +355,8 @@
%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
@@ -379,6 +393,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.172 2012/01/18 09:44:13 glen
+- install hicolor icons instead of pixmaps. see http://crbug.com/110339
+
Revision 1.171 2012/01/15 21:31:41 arekm
- revert jpeg speedup change that causes jpeg corruption as it only works with
lijpeg-turbo >= 1.1.90
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.171&r2=1.172&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
