rpms/qt4/devel .cvsignore, 1.19, 1.20 linguist.desktop, 1.3, 1.4 qt4.spec, 1.64, 1.65 qtconfig.desktop, 1.4, 1.5 qtdemo.desktop, 1.3, 1.4 sources, 1.15, 1.16 qtdemo-qt4.png, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore linguist.desktop qt4.spec qtconfig.desktop 
	qtdemo.desktop sources 
Removed Files:
	qtdemo-qt4.png 
Log Message:
* Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-5
- include qt4-logo icon, used by qtdemo/qtconfig (#241452)
- linquist.desktop: use new linguist4 icons
- -devel,-x11: %post/%postun scriptlets (icons, mimetypes)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	9 Aug 2007 11:32:45 -0000	1.19
+++ .cvsignore	13 Sep 2007 17:29:57 -0000	1.20
@@ -1,3 +1,4 @@
 clog
-qt-x11-opensource-src-4.3.0.tar.gz
+hi128-app-qt4-logo.png
+hi48-app-qt4-logo.png
 qt-x11-opensource-src-4.3.1.tar.gz


Index: linguist.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/linguist.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linguist.desktop	14 Jun 2007 20:41:02 -0000	1.3
+++ linguist.desktop	13 Sep 2007 17:29:57 -0000	1.4
@@ -2,7 +2,7 @@
 Name=Qt4 Linguist 
 Comment=Add translations to Qt4 applications
 Exec=linguist-qt4
-Icon=linguist
+Icon=linguist4
 MimeType=application/x-linguist;
 Terminal=false
 Encoding=UTF-8


Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- qt4.spec	13 Sep 2007 15:23:13 -0000	1.64
+++ qt4.spec	13 Sep 2007 17:29:57 -0000	1.65
@@ -4,7 +4,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 # GPLv2+exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv2
@@ -22,7 +22,7 @@
 Source1: Trolltech.conf
 
 # See http://bugzilla.redhat.com/223663
-%define multilib_archs x86_64 %{ix86} ppc64 ppc s390 s390x sparc64 sparc
+%define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparc
 Source5: qconfig-multilib.h
 
 # search for assistant-qt4 instead of (qt3's) assistant in $PATH 
@@ -43,7 +43,9 @@
 Source23: qtdemo.desktop
 Source24: qtconfig.desktop
 
-Source30: qtdemo-qt4.png
+# upstream qt4-logo, http://trolltech.com/images/products/qt/qt4-logo
+Source30: hi128-app-qt4-logo.png
+Source31: hi48-app-qt4-logo.png
 
 ## optional plugin bits
 # set to -no-sql-<driver> to disable
@@ -144,7 +146,6 @@
 Requires: libpng-devel
 Requires: libjpeg-devel
 Requires: pkgconfig
-#Requires: glib2-devel
 Requires: rpm
 Obsoletes: %{name}-designer < %{version}-%{release}
 Provides:  %{name}-designer = %{version}-%{release}
@@ -417,10 +418,17 @@
 # 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
+# qt4-logo (generic) icons
+install -p -m644 -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qt4-logo.png
+install -p -m644 -D %{SOURCE31} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qt4-logo.png
+# linguist icons
+for icon in tools/linguist/images/icons/linguist-*-32.png ; do
+  size=$(echo $(basename ${icon}) | cut -d- -f2)
+  install -p -m644 -D ${icon} %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/linguist4.png
+done
+# qtconfig icon (it's 50x50 actually, it's pretty generic as-is anyway, use qt4-logo instead -- Rex )
+#install -p -m644 -D tools/qtconfig/images/appicon.png \
+#                    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qtconfig4.png
 
 # Qt.pc
 cat >%{buildroot}%{_libdir}/pkgconfig/Qt.pc<<EOF
@@ -469,6 +477,24 @@
 
 %postun -p /sbin/ldconfig
 
+%post devel
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+%postun devel
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+%post x11
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+%postun x11
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
 
 %files
 %defattr(-,root,root,-)
@@ -517,7 +543,7 @@
 %{_qt4_bindir}/qt*config*
 %{_bindir}/qt*config*
 %{_datadir}/applications/*qtconfig*.desktop
-%{_datadir}/icons/hicolor/48x48/apps/qtconfig-qt4.png
+%{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -564,6 +590,7 @@
 %{_qt4_bindir}/linguist*
 %{_bindir}/linguist*
 %{_datadir}/applications/*linguist*.desktop
+%{_datadir}/icons/hicolor/*/apps/linquist4.*
 
 %files doc
 %defattr(-,root,root,-)
@@ -580,7 +607,6 @@
 %{_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 
@@ -608,6 +634,11 @@
 
 
 %changelog
+* Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-5
+- include qt4-logo icon, used by qtdemo/qtconfig (#241452)
+- linquist.desktop: use new linguist4 icons
+- -devel,-x11: %%post/%%postun scriptlets (icons, mimetypes)
+
 * Thu Sep 13 2007 Than Ngo <than at redhat.com> -  4.3.1-4
 - fixed bz241452, add qtdemo/qtconfig icons
 - fixed bz249242, designer4 - segmentation fault on s390x


Index: qtconfig.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qtconfig.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qtconfig.desktop	14 Jun 2007 20:41:02 -0000	1.4
+++ qtconfig.desktop	13 Sep 2007 17:29:57 -0000	1.5
@@ -2,6 +2,7 @@
 Name=Qt4 Config 
 Comment=Configure Qt4 behavior, styles, fonts
 Exec=qtconfig-qt4
+Icon=qt4-logo
 Terminal=false
 Encoding=UTF-8
 Type=Application


Index: qtdemo.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qtdemo.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qtdemo.desktop	14 Jun 2007 20:41:02 -0000	1.3
+++ qtdemo.desktop	13 Sep 2007 17:29:57 -0000	1.4
@@ -2,6 +2,7 @@
 Name=Qt4 Demo 
 Comment=Show Qt4 demos and programming examples
 Exec=qtdemo-qt4
+Icon=qt4-logo
 Terminal=false
 Encoding=UTF-8
 Type=Application


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	9 Aug 2007 11:32:45 -0000	1.15
+++ sources	13 Sep 2007 17:29:57 -0000	1.16
@@ -1 +1,3 @@
+d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
+6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 ec255dcc2b30f5efe0ded85ae8a75e13  qt-x11-opensource-src-4.3.1.tar.gz