rpms/qt/devel .cvsignore, 1.53, 1.54 qt.spec, 1.261, 1.262 sources, 1.54, 1.55 qt-x11-opensource-src-4.5.0-linguist-crash.patch, 1.1, NONE qt-x11-opensource-src-4.5.0-lrelease.patch, 1.1, NONE qt-x11-opensource-src-4.5.0-rc1-ppc64.patch, 1.3, NONE qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch, 1.1, NONE

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28472

Modified Files:
	.cvsignore qt.spec sources 
Removed Files:
	qt-x11-opensource-src-4.5.0-linguist-crash.patch 
	qt-x11-opensource-src-4.5.0-lrelease.patch 
	qt-x11-opensource-src-4.5.0-rc1-ppc64.patch 
	qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch 
Log Message:
4.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	25 Mar 2009 18:34:14 -0000	1.53
+++ .cvsignore	23 Apr 2009 11:43:37 -0000	1.54
@@ -2,3 +2,5 @@
 hi48-app-qt4-logo.png
 qt-x11-opensource-src-4.5.0.tar.bz2
 qt-copy-patches-20090325svn.tar.bz2
+qt-copy-patches-20090423svn.tar.bz2
+qt-x11-opensource-src-4.5.1.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- qt.spec	14 Apr 2009 19:40:59 -0000	1.261
+++ qt.spec	23 Apr 2009 11:43:37 -0000	1.262
@@ -11,8 +11,8 @@
 %else
 Name:    qt4
 %endif
-Version: 4.5.0
-Release: 14%{?dist}
+Version: 4.5.1
+Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -37,9 +37,6 @@
 Patch2: qt-x11-opensource-src-4.2.2-multilib-optflags.patch
 Patch3: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch
 Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch
-Patch10: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch
-Patch11: qt-x11-opensource-src-4.5.0-linguist-crash.patch 
-Patch12: qt-x11-opensource-src-4.5.0-lrelease.patch
 # hack around gcc/ppc crasher, http://bugzilla.redhat.com/492185
 Patch13: qt-x11-opensource-src-4.5.0-gcc_hack.patch
 # qt fails to build on ia64: http://bugzilla.redhat.com/492174
@@ -49,7 +46,6 @@
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
-Patch50: qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch
 Patch51: qt-x11-opensource-src-4.5.0-qdoc3.patch
 Patch52: qt-4.5-sparc64.patch
 # fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
@@ -58,7 +54,7 @@
 Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
 
 ## qt-copy patches
-%define qt_copy 20090325
+%define qt_copy 20090423
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
 %{?qt_copy:Provides: qt-copy = %{qt_copy}}
@@ -312,6 +308,10 @@
 
 %if 0%{?qt_copy}
 echo "0250" >> patches/DISABLED
+echo "0245" >> patches/DISABLED
+echo "0275" >> patches/DISABLED
+echo "0276" >> patches/DISABLED
+echo "0278" >> patches/DISABLED
 test -x apply_patches && ./apply_patches
 %endif
 
@@ -322,13 +322,9 @@
 %patch3 -p1 -b .multilib-QMAKEPATH
 %endif
 %patch5 -p1 -b .bz#437440-as_IN-437440
-%patch10 -p1 -b .ppc64
-%patch11 -p1 -b .linguist-crash
-%patch12 -p1 -b .lrelease
 %patch13 -p1 -b .gcc_hack
 %patch14 -p1 -b .ia64_boilerplate
 %patch15 -p1 -b .disable_ft_lcdfilter
-%patch50 -p1 -b .qhostaddress
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
@@ -376,6 +372,7 @@
 # build shared, threaded (default) libraries
 ./configure -v \
   -confirm-license \
+  -opensource \
   -optimized-qmake \
   -prefix %{_qt4_prefix} \
   -bindir %{_qt4_bindir} \
@@ -812,6 +809,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Than Ngo <than at redhat.com> - 4.5.1-1
+- 4.5.1
+
 * Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-14
 - fix vrgb/vgbr corruption, disable QT_USE_FREETYPE_LCDFILTER (#490377)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	25 Mar 2009 18:34:14 -0000	1.54
+++ sources	23 Apr 2009 11:43:38 -0000	1.55
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-55e8c74a89e1bc128a5a6f1ff6b8b5ba  qt-x11-opensource-src-4.5.0.tar.bz2
-74cac34a16b483ddc0a90204a0af8314  qt-copy-patches-20090325svn.tar.bz2
+e658d26376d678bd45a877ca47e42b7a  qt-copy-patches-20090423svn.tar.bz2
+afc43e566341cf3e5ed0bcb974f0c3b2  qt-x11-opensource-src-4.5.1.tar.bz2


--- qt-x11-opensource-src-4.5.0-linguist-crash.patch DELETED ---


--- qt-x11-opensource-src-4.5.0-lrelease.patch DELETED ---


--- qt-x11-opensource-src-4.5.0-rc1-ppc64.patch DELETED ---


--- qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch DELETED ---