packages: qt4/qt4.spec - install more icons for assistant and linguist

[megabajt]

Author: megabajt                     Date: Thu Apr 14 14:57:56 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install more icons for assistant and linguist

---- Files affected:
packages/qt4:
   qt4.spec (1.287 -> 1.288) 

---- Diffs:

================================================================
Index: packages/qt4/qt4.spec
diff -u packages/qt4/qt4.spec:1.287 packages/qt4/qt4.spec:1.288
--- packages/qt4/qt4.spec:1.287	Thu Mar 31 20:11:48 2011
+++ packages/qt4/qt4.spec	Thu Apr 14 16:57:51 2011
@@ -117,7 +117,7 @@
 BuildRequires:	pkgconfig
 %{?with_pgsql:BuildRequires:	postgresql-backend-devel}
 %{?with_pgsql:BuildRequires:	postgresql-devel}
-BuildRequires:	rpmbuild(macros) >= 1.213
+BuildRequires:	rpmbuild(macros) >= 1.602
 BuildRequires:	sed >= 4.0
 %{?with_sqlite:BuildRequires:	sqlite-devel}
 %{?with_sqlite3:BuildRequires:	sqlite3-devel}
@@ -1207,6 +1207,7 @@
 Requires:	QtSql-sqlite3 = %{version}-%{release}
 Requires:	QtWebKit = %{version}-%{release}
 Requires:	QtXml = %{version}-%{release}
+Requires:	hicolor-icon-theme
 
 %description assistant
 Qt Assistant is a tool for browsing on-line documentation with
@@ -1252,6 +1253,7 @@
 Summary(pl.UTF-8):	Aplikacja ułatwiająca tłumaczenie aplikacji opartych o Qt
 Group:		X11/Development/Tools
 Requires:	QtUiTools = %{version}-%{release}
+Requires:	hicolor-icon-theme
 
 %description linguist
 This program provides an interface that shortens and helps systematize
@@ -1611,10 +1613,16 @@
 	$RPM_BUILD_ROOT%{_pixmapsdir}/qtconfig-qt4.png
 
 install %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir}/linguist-qt4.desktop
-install tools/linguist/linguist/images/appicon.png \
-	$RPM_BUILD_ROOT%{_pixmapsdir}/linguist-qt4.png
+for f in tools/linguist/linguist/images/icons/linguist-*-32.png; do
+	size=$(echo $(basename ${f}) | cut -d- -f2)
+	install -D $f $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${size}x${size}/apps/linguist-qt4.png
+done
 
 install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}/assistant-qt4.desktop
+install -D tools/assistant/tools/assistant/images/assistant.png \
+	$RPM_BUILD_ROOT%{_iconsdir}/hicolor/32x32/apps/assistant-qt4.png
+install -D tools/assistant/tools/assistant/images/assistant-128.png \
+	$RPM_BUILD_ROOT%{_iconsdir}/hicolor/128x128/apps/assistant-qt4.png
 
 install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/designer-qt4.desktop
 install tools/designer/src/designer/images/designer.png \
@@ -1830,6 +1838,18 @@
 %post   -n QtXmlPatterns	-p /sbin/ldconfig
 %postun -n QtXmlPatterns	-p /sbin/ldconfig
 
+%post assistant
+%update_icon_cache hicolor
+
+%postun assistant
+%update_icon_cache hicolor
+
+%post linguist
+%update_icon_cache hicolor
+
+%postun linguist
+%update_icon_cache hicolor
+
 %post	phonon		-p /sbin/ldconfig
 %postun	phonon		-p /sbin/ldconfig
 
@@ -2086,7 +2106,7 @@
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/qt4-assistant.qm
 %lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/qt4-assistant.qm
 %{_desktopdir}/assistant-qt4.desktop
-#%{_pixmapsdir}/assistant-qt4.png
+%{_iconsdir}/hicolor/*/apps/assistant-qt4.png
 
 %files build
 %defattr(644,root,root,755)
@@ -2147,7 +2167,7 @@
 %lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/qt4-linguist.qm
 %{_datadir}/qt4/phrasebooks
 %{_desktopdir}/linguist-qt4.desktop
-%{_pixmapsdir}/linguist-qt4.png
+%{_iconsdir}/hicolor/*/apps/linguist-qt4.png
 
 %if %{without system_phonon}
 %files phonon
@@ -2360,6 +2380,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.288  2011/04/14 14:57:51  megabajt
+- install more icons for assistant and linguist
+
 Revision 1.287  2011/03/31 18:11:48  arekm
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4.spec?r1=1.287&r2=1.288&f=u