rpms/qt/devel .cvsignore, 1.67, 1.68 qt.spec, 1.367, 1.368 sources, 1.68, 1.69 0010-Fix-error-line-not-to-have-a-as-it-s-not-correct.patch, 1.1, NONE 0011-Fill-gap-of-X.org-XFree-multimedia-special-launcher-.patch, 1.1, NONE 0013-Fix-QNativeImage-constructor.patch, 1.1, NONE 0274-shm-native-image-fix.patch, 1.3, NONE 63839f0ca3836995cda2fb94cf7dd724d6f6ca52.patch, 1.1, NONE cec34b01f2c797475245e9416bbcce6b69a4cb38.patch, 1.1, NONE

[Than Ngo]

Author: than

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

Modified Files:
	.cvsignore qt.spec sources 
Removed Files:
	0010-Fix-error-line-not-to-have-a-as-it-s-not-correct.patch 
	0011-Fill-gap-of-X.org-XFree-multimedia-special-launcher-.patch 
	0013-Fix-QNativeImage-constructor.patch 
	0274-shm-native-image-fix.patch 
	63839f0ca3836995cda2fb94cf7dd724d6f6ca52.patch 
	cec34b01f2c797475245e9416bbcce6b69a4cb38.patch 
Log Message:
4.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	1 Dec 2009 11:50:53 -0000	1.67
+++ .cvsignore	19 Jan 2010 18:00:57 -0000	1.68
@@ -9,3 +9,4 @@ hi48-phonon-gstreamer.png
 hi64-phonon-gstreamer.png
 qt-everywhere-opensource-src-4.6.0-rc1.tar.gz
 qt-everywhere-opensource-src-4.6.0.tar.gz
+qt-everywhere-opensource-src-4.6.1.tar.gz


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -p -r1.367 -r1.368
--- qt.spec	11 Jan 2010 20:03:06 -0000	1.367
+++ qt.spec	19 Jan 2010 18:00:58 -0000	1.368
@@ -12,8 +12,8 @@
 Summary: Qt toolkit
 Name:    qt
 Epoch:   1
-Version: 4.6.0
-Release: 5%{?dist}
+Version: 4.6.1
+Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -72,19 +72,7 @@ Patch206: 0006-Fix-configure.exe-to-do-a
 Patch207: 0007-When-using-qmake-outside-qt-src-tree-it-sometimes-ge.patch
 Patch208: 0008-This-patch-makes-the-raster-graphics-system-use-shar.patch
 Patch209: 0009-Restore-a-section-of-the-file-that-got-removed-due-t.patch
-## older, but actually applies, version of patches 208, 209, 213 (double check)
-Patch274: 0274-shm-native-image-fix.patch
-Patch210: 0010-Fix-error-line-not-to-have-a-as-it-s-not-correct.patch
-Patch211: 0011-Fill-gap-of-X.org-XFree-multimedia-special-launcher-.patch
 Patch212: 0012-Add-context-to-tr-calls-in-QShortcut.patch
-Patch213: 0013-Fix-QNativeImage-constructor.patch
-# http://qt.gitorious.org/qt/kde-qt/commit/cec34b01f2c797475245e9416bbcce6b69a4cb38
-#Patch214: http://qt.gitorious.org/+kde-developers/qt/kde-qt/commit/cec34b01f2c797475245e9416bbcce6b69a4cb38.patch
-# above edited to omit tests/ portion
-Patch214: cec34b01f2c797475245e9416bbcce6b69a4cb38.patch
-#Patch215: http://qt.gitorious.org/+kde-developers/qt/kde-qt/commit/63839f0ca3836995cda2fb94cf7dd724d6f6ca52.patch
-# above edited to omit tests/ portion
-Patch215: 63839f0ca3836995cda2fb94cf7dd724d6f6ca52.patch
 
 
 Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
@@ -429,17 +417,7 @@ Qt libraries used for drawing widgets an
 %patch205 -p1 -b .kde-qt-0005
 %patch206 -p1 -b .kde-qt-0006
 %patch207 -p1 -b .kde-qt-0007
-## needs manual love
-#patch208 -p1 -b .kde-qt-0008
-#patch209 -p1 -b .kde-qt-0009
-#patch274 -p1 -b .qt-copy-0274
-## already applied
-#patch210 -p1 -b .kde-qt-0010
-#patch211 -p1 -b .kde-qt-0011
 %patch212 -p1 -b .kde-qt-0012
-#patch213 -p1 -b .kde-qt-0013
-#patch214 -p1 -b .kde-qt-214
-%patch215 -p1 -b .kde-qt-215
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -1027,6 +1005,9 @@ fi
 
 
 %changelog
+* Tue Jan 19 2010 Than Ngo <than at redhat.com> - 4.6.1-1
+- 4.6.1
+
 * Mon Jan 11 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.6.0-5
 - bitmap_font_speed patch (QTBUG-7255)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources	1 Dec 2009 11:50:54 -0000	1.68
+++ sources	19 Jan 2010 18:00:58 -0000	1.69
@@ -7,4 +7,4 @@ d9f511e4b51983b4e10eb58b320416d5  hi128-
 12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
 86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
 153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png
-2a7b5126f2450d8525af355fc4c12ad6  qt-everywhere-opensource-src-4.6.0.tar.gz
+0542a4be6425451ab5f668c6899cac36  qt-everywhere-opensource-src-4.6.1.tar.gz


--- 0010-Fix-error-line-not-to-have-a-as-it-s-not-correct.patch DELETED ---


--- 0011-Fill-gap-of-X.org-XFree-multimedia-special-launcher-.patch DELETED ---


--- 0013-Fix-QNativeImage-constructor.patch DELETED ---


--- 0274-shm-native-image-fix.patch DELETED ---


--- 63839f0ca3836995cda2fb94cf7dd724d6f6ca52.patch DELETED ---


--- cec34b01f2c797475245e9416bbcce6b69a4cb38.patch DELETED ---