rpms/qt4/F-7 .cvsignore, 1.19, 1.20 qt4.spec, 1.52, 1.53 sources, 1.15, 1.16

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/qt4/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12635

Modified Files:
	.cvsignore qt4.spec sources 
Log Message:
* Wed Dec 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.3-1
- qt-4.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-7/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	4 Oct 2007 19:24:35 -0000	1.19
+++ .cvsignore	9 Dec 2007 04:09:43 -0000	1.20
@@ -3,3 +3,4 @@
 hi48-app-qt4-logo.png
 qt-x11-opensource-src-4.3.1.tar.gz
 qt-x11-opensource-src-4.3.2.tar.gz
+qt-x11-opensource-src-4.3.3.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-7/qt4.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- qt4.spec	21 Oct 2007 18:11:27 -0000	1.52
+++ qt4.spec	9 Dec 2007 04:09:43 -0000	1.53
@@ -3,8 +3,8 @@
 
 Summary: Qt toolkit
 Name:	 qt4
-Version: 4.3.2
-Release: 4%{?dist}
+Version: 4.3.3
+Release: 1%{?dist}
 
 # GPLv2+exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv2
@@ -29,8 +29,6 @@
 Patch1: qt-x11-opensource-src-4.3.0-qassistant-qt4.patch
 # multilib hacks 
 Patch2: qt-x11-opensource-src-4.2.2-multilib.patch
-# Slowdown with 4.3.2 (http://bugzilla.redhat.com/334281)
-Patch3: qt-x11-opensource-src-4.3.2-rh#334281.patch
 ## qt-copy patches
 
 Source10: qt4-wrapper.sh
@@ -228,7 +226,6 @@
 %patch1 -p1 -b .assistant4
 # don't use -b on mkspec files, else they get installed too.
 %patch2 -p1
-%patch3 -p1 -b .rh#334281
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -271,7 +268,9 @@
 %build
 
 # build shared, threaded (default) libraries
-echo yes | ./configure -v \
+./configure -v \
+  -confirm-license \
+  -optimized-qmake \
   -prefix %{_qt4_prefix} \
   -bindir %{_qt4_bindir} \
   -datadir %{_qt4_datadir} \
@@ -520,6 +519,8 @@
 %{_qt4_datadir}/phrasebooks/
 %{_qt4_libdir}/libQtCore.so.*
 %if "%{?qdbus}" == "-qdbus"
+%{_bindir}/qdbus*
+%{_qt4_bindir}/qdbus*
 %{_qt4_libdir}/libQtDBus.so.*
 %endif
 %{_qt4_libdir}/libQtNetwork.so.*
@@ -544,6 +545,9 @@
 %{_qt4_plugindir}/*
 %exclude %{_qt4_plugindir}/designer
 %exclude %{_qt4_plugindir}/sqldrivers
+# Qt Assistant
+%{_qt4_bindir}/assistant*
+%{_bindir}/assistant*
 #-config bits
 %{_qt4_bindir}/qt*config*
 %{_bindir}/qt*config*
@@ -556,10 +560,6 @@
 %{_qt4_bindir}/lrelease*
 %{_qt4_bindir}/lupdate*
 %{_qt4_bindir}/moc*
-%if "%{?qdbus}" == "-qdbus"
-%{_qt4_bindir}/qdbus*
-%{_bindir}/qdbus*
-%endif
 %{_qt4_bindir}/pixeltool*
 %{_qt4_bindir}/qmake*
 %{_qt4_bindir}/qt3to4
@@ -638,6 +638,18 @@
 
 
 %changelog
+* Wed Dec 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.3-1
+- qt-4.3.3
+
+* Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.2-7
+- move assistant to -x11, leave .desktop in -doc (#147948)
+
+* Sun Dec 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.2-6
+- move qdbus to main pkg (#407861)
+
+* Mon Oct 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.2-5
+- -optimized-qmake
+
 * Fri Oct 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.2-4
 - slowdown with 4.3.2 (#334281)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-7/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	4 Oct 2007 19:24:35 -0000	1.15
+++ sources	9 Dec 2007 04:09:43 -0000	1.16
@@ -1,3 +1,3 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-a60490b36099bdd10c4d2f55430075b3  qt-x11-opensource-src-4.3.2.tar.gz
+19678fe35170559cd6a6fa531c57799c  qt-x11-opensource-src-4.3.3.tar.gz