rpms/qt/devel .cvsignore, 1.71, 1.72 qt.spec, 1.411, 1.412 sources, 1.72, 1.73 0ebc9783d8ca0c4b27208bbc002c53c52c19ab4c.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29366

Modified Files:
	.cvsignore qt.spec sources 
Removed Files:
	0ebc9783d8ca0c4b27208bbc002c53c52c19ab4c.patch 
Log Message:
* Thu Jul 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.7.0-0.25.beta1
- 4.7.0-beta2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- .cvsignore	6 May 2010 14:05:57 -0000	1.71
+++ .cvsignore	8 Jul 2010 12:02:44 -0000	1.72
@@ -7,4 +7,4 @@ hi22-phonon-gstreamer.png
 hi32-phonon-gstreamer.png
 hi48-phonon-gstreamer.png
 hi64-phonon-gstreamer.png
-qt-everywhere-opensource-src-4.7.0-beta1.tar.gz
+qt-everywhere-opensource-src-4.7.0-beta2.tar.gz


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -p -r1.411 -r1.412
--- qt.spec	1 Jul 2010 17:22:23 -0000	1.411
+++ qt.spec	8 Jul 2010 12:02:44 -0000	1.412
@@ -13,13 +13,13 @@
 # enable kde-qt integration/patches 
 %define kde_qt 1
 
-%define pre beta1 
+%define pre beta2
 
 Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.7.0
-Release: 0.24.%{pre}%{?dist}
+Release: 0.25.%{pre}%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -87,8 +87,6 @@ Patch209: 0009-Restore-a-section-of-the-
 Patch212: 0012-Add-context-to-tr-calls-in-QShortcut.patch
 # based on http://qt.gitorious.org/+kde-developers/qt/kde-qt/commit/55ef01d93f8257b5927660290fc1ead0b2b74ec9.patch
 Patch217: qt-everywhere-opensource-src-4.7.0-beta1-QT_GRAPHICSSYSTEM.patch
-# QTBUG-9793
-Patch218: http://qt.gitorious.org/qt/qt/commit/0ebc9783d8ca0c4b27208bbc002c53c52c19ab4c.patch
 
 Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
 Source11: hi16-phonon-gstreamer.png
@@ -451,7 +449,6 @@ Qt libraries used for drawing widgets an
 %patch212 -p1 -b .kde-qt-0012
 %endif
 %patch217 -p1 -b .QT_GRAPHICSSYSTEM
-%patch218 -p1 -b .QTBUG-9793
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -1105,6 +1102,9 @@ fi
 
 
 %changelog
+* Thu Jul 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.7.0-0.25.beta1
+- 4.7.0-beta2
+
 * Tue Jul 01 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.7.0-0.24.beta1
 - X11Embed broken (rh#609757, QTBUG-10809)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	6 May 2010 14:05:58 -0000	1.72
+++ sources	8 Jul 2010 12:02:45 -0000	1.73
@@ -7,4 +7,4 @@ d9f511e4b51983b4e10eb58b320416d5  hi128-
 12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
 86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
 153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png
-128dae41b23bb427b735548c7864703a  qt-everywhere-opensource-src-4.7.0-beta1.tar.gz
+1449443c2d33ab9fefbd37b7104d0cdf  qt-everywhere-opensource-src-4.7.0-beta2.tar.gz


--- 0ebc9783d8ca0c4b27208bbc002c53c52c19ab4c.patch DELETED ---