rpms/qt4/devel qtdemo-qt4.png,NONE,1.1 qt4.spec,1.62,1.63

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25459

Modified Files:
	qt4.spec 
Added Files:
	qtdemo-qt4.png 
Log Message:
fixed bz241452, add qtdemo/qtconfig icons



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- qt4.spec	23 Aug 2007 11:57:32 -0000	1.62
+++ qt4.spec	13 Sep 2007 15:14:17 -0000	1.63
@@ -4,7 +4,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # GPLv2+exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv2
@@ -43,6 +43,8 @@
 Source23: qtdemo.desktop
 Source24: qtconfig.desktop
 
+Source30: qtdemo-qt4.png
+
 ## optional plugin bits
 # set to -no-sql-<driver> to disable
 # set to -qt-sql-<driver> to enable *in* qt library
@@ -415,6 +417,11 @@
 # Trolltech.conf
 install -p -m644 -D %{SOURCE1} %{buildroot}%{_qt4_sysconfdir}/Trolltech.conf
 
+# qtdemo/qtconfig icons
+install -p -m644 -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qtdemo-qt4.png
+install -p -m644 -D tools/qtconfig/images/appicon.png \
+                    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qtconfig-qt4.png
+
 # Qt.pc
 cat >%{buildroot}%{_libdir}/pkgconfig/Qt.pc<<EOF
 prefix=%{_qt4_prefix}
@@ -510,6 +517,7 @@
 %{_qt4_bindir}/qt*config*
 %{_bindir}/qt*config*
 %{_datadir}/applications/*qtconfig*.desktop
+%{_datadir}/icons/hicolor/48x48/apps/qtconfig-qt4.png
 
 %files devel
 %defattr(-,root,root,-)
@@ -572,6 +580,7 @@
 %{_qt4_bindir}/qt*demo*
 %{_bindir}/qt*demo*
 %{_datadir}/applications/*qtdemo*.desktop
+%{_datadir}/icons/hicolor/48x48/apps/qtdemo-qt4.png
 
 %if "%{?odbc}" == "-plugin-sql-odbc"
 %files odbc 
@@ -599,6 +608,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Than Ngo <than at redhat.com> -  4.3.1-4
+- fixed bz241452, add qtdemo/qtconfig icons
+
 * Wed Aug 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-3
 - ppc64 patch (#246324)