packages: iceape/iceape.spec - install rebranded icon

[baggins]

Author: baggins                      Date: Tue Jun  5 17:02:08 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install rebranded icon

---- Files affected:
packages/iceape:
   iceape.spec (1.41 -> 1.42) 

---- Diffs:

================================================================
Index: packages/iceape/iceape.spec
diff -u packages/iceape/iceape.spec:1.41 packages/iceape/iceape.spec:1.42
--- packages/iceape/iceape.spec:1.41	Tue Jun  5 15:08:39 2012
+++ packages/iceape/iceape.spec	Tue Jun  5 19:02:03 2012
@@ -419,6 +419,9 @@
 	installdir=%{_libdir}/%{name} \
 	PKG_SKIP_STRIP=1
 
+%{__make} -C iceape/branding install \
+	DESTDIR=$RPM_BUILD_ROOT
+
 cp -a mozilla/dist/iceape/* $RPM_BUILD_ROOT%{_libdir}/%{name}/
 
 %if %{with xulrunner}
@@ -482,8 +485,6 @@
 install %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} \
 	$RPM_BUILD_ROOT%{_desktopdir}
 
-cp -p %{topdir}/comm-release/suite/branding/nightly/content/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
-
 # files created by iceape -register
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/xpti.dat
@@ -537,11 +538,13 @@
 %post
 %{_libdir}/%{name}/register || :
 %update_browser_plugins
+%update_icon_cache hicolor
 %update_desktop_database
 
 %postun
 if [ "$1" = 0 ]; then
 	%update_browser_plugins
+	%update_icon_cache hicolor
 fi
 
 %files
@@ -728,7 +731,8 @@
 %{_datadir}/%{name}/isp/movemail.rdf
 %{_datadir}/%{name}/isp/rss.rdf
 
-%{_pixmapsdir}/iceape.png
+%{_iconsdir}/hicolor/*/apps/iceape.png
+%{_iconsdir}/hicolor/scalable/apps/iceape.svg
 %{_desktopdir}/%{name}.desktop
 %{_desktopdir}/%{name}-composer.desktop
 %{_desktopdir}/%{name}-mail.desktop
@@ -787,6 +791,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42  2012/06/05 17:02:03  baggins
+- install rebranded icon
+
 Revision 1.41  2012/06/05 13:08:39  baggins
 - updated iceape branding, from debian
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/iceape/iceape.spec?r1=1.41&r2=1.42