rpms/qt4/FC-6 .cvsignore, 1.18, 1.19 linguist.desktop, 1.3, 1.4 qt4.spec, 1.41, 1.42 qtconfig.desktop, 1.4, 1.5 qtdemo.desktop, 1.3, 1.4 sources, 1.14, 1.15 qt-x11-opensource-src-4.3.1-ppc64.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/qt4/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25363

Modified Files:
	.cvsignore linguist.desktop qt4.spec qtconfig.desktop 
	qtdemo.desktop sources 
Removed Files:
	qt-x11-opensource-src-4.3.1-ppc64.patch 
Log Message:
* Thu Oct 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.2-1
- qt-4.3.2
- (re)fix ppc64 segfaults, ppc64 fix upstreamed (previous patch was 
  inadvertantly not applied) (#246324)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/FC-6/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	23 Aug 2007 14:59:25 -0000	1.18
+++ .cvsignore	5 Oct 2007 12:03:20 -0000	1.19
@@ -1,3 +1,5 @@
 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
+qt-x11-opensource-src-4.3.2.tar.gz


Index: linguist.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/FC-6/linguist.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linguist.desktop	21 Jul 2007 21:30:42 -0000	1.3
+++ linguist.desktop	5 Oct 2007 12:03:20 -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/FC-6/qt4.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- qt4.spec	23 Aug 2007 14:59:25 -0000	1.41
+++ qt4.spec	5 Oct 2007 12:03:20 -0000	1.42
@@ -3,8 +3,8 @@
 
 Summary: Qt toolkit
 Name:	 qt4
-Version: 4.3.1
-Release: 3%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 
 # GPLv2+exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv2
@@ -22,15 +22,13 @@
 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 
 Patch1: qt-x11-opensource-src-4.3.0-qassistant-qt4.patch
 # multilib hacks 
 Patch2: qt-x11-opensource-src-4.2.2-multilib.patch
-# ppc64 segfaults, http://bugzilla.redhat.com/246324
-Patch3: qt-x11-opensource-src-4.3.1-ppc64.patch
 ## qt-copy patches
 
 Source10: qt4-wrapper.sh
@@ -43,6 +41,10 @@
 Source23: qtdemo.desktop
 Source24: qtconfig.desktop
 
+# 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
 # set to -qt-sql-<driver> to enable *in* qt library
@@ -142,8 +144,6 @@
 Requires: libpng-devel
 Requires: libjpeg-devel
 Requires: pkgconfig
-#Requires: glib2-devel
-Requires: rpm
 Obsoletes: %{name}-designer < %{version}-%{release}
 Provides:  %{name}-designer = %{version}-%{release}
 %if "%{name}" != "qt4"
@@ -210,6 +210,7 @@
 Summary: Qt GUI-related libraries
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: redhat-rpm-config rpm
 
 %description x11
 Qt libraries which are used for drawing widgets and OpenGL items.
@@ -415,6 +416,18 @@
 # Trolltech.conf
 install -p -m644 -D %{SOURCE1} %{buildroot}%{_qt4_sysconfdir}/Trolltech.conf
 
+# 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/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
 prefix=%{_qt4_prefix}
@@ -462,6 +475,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,-)
@@ -496,6 +527,7 @@
 
 %files x11 
 %defattr(-,root,root,-)
+%{_sysconfdir}/rpm/macros.*
 %{_qt4_libdir}/libQt3Support.so.*
 %{_qt4_libdir}/libQtAssistantClient.so.*
 %{_qt4_libdir}/libQtDesigner.so.*
@@ -510,11 +542,11 @@
 %{_qt4_bindir}/qt*config*
 %{_bindir}/qt*config*
 %{_datadir}/applications/*qtconfig*.desktop
+%{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 %files devel
 %defattr(-,root,root,-)
 #config /etc/profile.d/*
-%{_sysconfdir}/rpm/macros.*
 %{_qt4_bindir}/lrelease*
 %{_qt4_bindir}/lupdate*
 %{_qt4_bindir}/moc*
@@ -556,6 +588,7 @@
 %{_qt4_bindir}/linguist*
 %{_bindir}/linguist*
 %{_datadir}/applications/*linguist*.desktop
+%{_datadir}/icons/hicolor/*/apps/linguist4.*
 
 %files doc
 %defattr(-,root,root,-)
@@ -599,6 +632,23 @@
 
 
 %changelog
+* Thu Oct 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.2-1
+- qt-4.3.2
+- (re)fix ppc64 segfaults, ppc64 fix upstreamed (previous patch was 
+  inadvertantly not applied) (#246324)
+
+* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-8
+- -x11: Req: redhat-rpm-config rpm, app-wrapper/multilib fun (#277581)
+
+* Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-7
+- include qt4-logo icon, used by qtdemo/qtconfig (#241452)
+- linguist.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
+
 * Wed Aug 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-3
 - ppc64 patch (#246324)
 


Index: qtconfig.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/FC-6/qtconfig.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qtconfig.desktop	21 Jul 2007 21:30:42 -0000	1.4
+++ qtconfig.desktop	5 Oct 2007 12:03:20 -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/FC-6/qtdemo.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qtdemo.desktop	21 Jul 2007 21:30:42 -0000	1.3
+++ qtdemo.desktop	5 Oct 2007 12:03:20 -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/FC-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	23 Aug 2007 14:59:25 -0000	1.14
+++ sources	5 Oct 2007 12:03:20 -0000	1.15
@@ -1 +1,3 @@
-ec255dcc2b30f5efe0ded85ae8a75e13  qt-x11-opensource-src-4.3.1.tar.gz
+d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
+6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
+a60490b36099bdd10c4d2f55430075b3  qt-x11-opensource-src-4.3.2.tar.gz


--- qt-x11-opensource-src-4.3.1-ppc64.patch DELETED ---