packages (CHROMIUM_16): chromium-browser/chromium-browser.spec - install hi...

[glen]

Author: glen                         Date: Wed Jan 18 09:08:49 2012 GMT
Module: packages                      Tag: CHROMIUM_16
---- Log message:
- install hicolor icons instead of pixmaps. see http://crbug.com/110339

---- Files affected:
packages/chromium-browser:
   chromium-browser.spec (1.167.2.1 -> 1.167.2.2) 

---- Diffs:

================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.167.2.1 packages/chromium-browser/chromium-browser.spec:1.167.2.2
--- packages/chromium-browser/chromium-browser.spec:1.167.2.1	Tue Jan 10 13:19:24 2012
+++ packages/chromium-browser/chromium-browser.spec	Wed Jan 18 10:08:43 2012
@@ -51,7 +51,7 @@
 Summary:	A WebKit powered web browser
 Name:		chromium-browser
 Version:	16.0.912.75
-Release:	1
+Release:	2
 License:	BSD, LGPL v2+ (ffmpeg)
 Group:		X11/Applications/Networking
 Source0:	http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.tar.xz
@@ -89,6 +89,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
@@ -129,6 +130,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
@@ -274,7 +276,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}
@@ -302,7 +304,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
@@ -318,11 +330,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
 
@@ -332,8 +346,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}/resources.pak
@@ -369,6 +383,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.167.2.2  2012/01/18 09:08:43  glen
+- install hicolor icons instead of pixmaps. see http://crbug.com/110339
+
 Revision 1.167.2.1  2012/01/10 12:19:24  glen
 - up to 16.0.912.75
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.167.2.1&r2=1.167.2.2&f=u