[qt] 4.7 rc1

[Than Ngo]

commit 3815b794ba18b9878109ef06e7896793525d105a
Author: Than Ngo <than at redhat.com>
Date:   Thu Aug 26 18:41:15 2010 +0200

    4.7 rc1

 .gitignore                                         |    1 +
 ...nsource-src-4.7.0-beta1-qtwebkit_gtk_init.patch |   47 --------------------
 ...ensource-src-4.5.3-system_ca_certificates.patch |   25 ----------
 qt.spec                                            |   13 ++---
 sources                                            |   11 +----
 5 files changed, 7 insertions(+), 90 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d73fd4d..8497d19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ hi32-phonon-gstreamer.png
 hi48-phonon-gstreamer.png
 hi64-phonon-gstreamer.png
 qt-everywhere-opensource-src-4.7.0-beta2.tar.gz
+/qt-everywhere-opensource-src-4.7.0-rc1.tar.gz
diff --git a/qt.spec b/qt.spec
index 1ae6f93..6db3bdc 100644
--- a/qt.spec
+++ b/qt.spec
@@ -11,13 +11,13 @@
 # enable kde-qt integration/patches 
 #define kde_qt 1
 
-%define pre beta2
+%define pre rc1
 
 Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.7.0
-Release: 0.26.%{pre}%{?dist}
+Release: 0.27.%{pre}%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -45,8 +45,6 @@ Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 # omit for now, (seems?) causes unwelcome side-effects -- Rex
 Patch16: qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch 
 Patch19: qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch 
-# use system ca-bundle certs, http://bugzilla.redhat.com/521911
-Patch22: qt-x11-opensource-src-4.5.3-system_ca_certificates.patch 
 Requires: ca-certificates
 # may be upstreamable, not sure yet
 # workaround for gdal/grass crashers wrt glib_eventloop null deref's
@@ -68,8 +66,6 @@ Patch58: qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch
 # security patches
 
 # upstream patches
-# https://bugs.webkit.org/show_bug.cgi?id=40567
-Patch100: qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_gtk_init.patch
 # http://bugreports.qt.nokia.com/browse/QTBUG-10809
 Patch101: http://qt.gitorious.org/+qt-developers/qt/staging/commit/9a1b0695277a3864b42d082095962f8742cdcf04.patch
 
@@ -417,7 +413,6 @@ Qt libraries used for drawing widgets and OpenGL items.
 %patch15 -p1 -b .enable_ft_lcdfilter
 #patch16 -p1 -b .kde4_plugins
 %patch19 -p1 -b .phonon_servicesfile
-%patch22 -p1 -b .system_ca_certificates
 %patch23 -p1 -b .glib_eventloop_nullcheck
 ## TODO: still worth carrying?  if so, upstream it.
 %patch53 -p1 -b .qatomic-inline-asm
@@ -430,7 +425,6 @@ Qt libraries used for drawing widgets and OpenGL items.
 # security fixes
 
 # upstream patches
-%patch100 -p1 -b .qtwebkit_gtk_init
 %patch101 -p1 -b .QTBUG-10809
 
 # kde-qt branch
@@ -1097,6 +1091,9 @@ fi
 
 
 %changelog
+* Thu Aug 26 2010 Than Ngo <than at redhat.com> - 4.7.0-0.27.rc1
+- 4.7.0 rc1
+
 * Thu Jul 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.7.0-0.26.beta2
 - rebase patches, avoiding use of patch fuzz
 - omit old qt-copy/kde-qt patches, pending review
diff --git a/sources b/sources
index b4fa2cc..4d1ce9c 100644
--- a/sources
+++ b/sources
@@ -1,10 +1 @@
-d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
-6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-8e3924f417fea67f72b2105faed2119c  gstreamer-logo.svg
-60de9d7e1cddd019f09fd036f0e5413a  hi128-phonon-gstreamer.png
-7ca265e0cf75b3b4c81e1490d3dba3be  hi16-phonon-gstreamer.png
-0a9f69d901aded140d4fed969c22e14f  hi22-phonon-gstreamer.png
-12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
-86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
-153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png
-1449443c2d33ab9fefbd37b7104d0cdf  qt-everywhere-opensource-src-4.7.0-beta2.tar.gz
+6ba503cea2f91c38b34594ed68c15d9a  qt-everywhere-opensource-src-4.7.0-rc1.tar.gz