From 3435ed35a779aa1a50b6cc091add71490c714a80 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Tue, 5 Mar 2013 22:43:22 -0600
Subject: [PATCH] 2.3-rc1

---
 .gitignore                    |  2 +-
 qtwebkit-2.3-fontconfig.patch |  9 ---------
 qtwebkit.spec                 | 18 ++++++++++--------
 sources                       |  2 +-
 4 files changed, 12 insertions(+), 19 deletions(-)
 delete mode 100644 qtwebkit-2.3-fontconfig.patch

diff --git a/.gitignore b/.gitignore
index f5f2689..4dc4a2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 /qtwebkit-developers-qtwebkit-qtwebkit-2.1.1.tar.xz
 /qtwebkit-2.2.2-source.tar.xz
-/qtwebkit-2.3-beta2.tar.xz
+/qtwebkit-2.3-rc1.tar.xz
diff --git a/qtwebkit-2.3-fontconfig.patch b/qtwebkit-2.3-fontconfig.patch
deleted file mode 100644
index 13ca3a4..0000000
--- a/qtwebkit-2.3-fontconfig.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -up webkit-qtwebkit-23/Source/WebCore/WebCore.pri.fontconfig webkit-qtwebkit-23/Source/WebCore/WebCore.pri
---- webkit-qtwebkit-23/Source/WebCore/WebCore.pri.fontconfig	2013-02-21 22:28:57.789764068 -0600
-+++ webkit-qtwebkit-23/Source/WebCore/WebCore.pri	2013-02-21 22:31:02.994198797 -0600
-@@ -356,4 +362,4 @@ contains(DEFINES, ENABLE_OPENCL=1) {
- 
- enable_fast_mobile_scrolling: DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1
- 
--!production_build:contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
-+contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
diff --git a/qtwebkit.spec b/qtwebkit.spec
index e76fdcb..de8c464 100644
--- a/qtwebkit.spec
+++ b/qtwebkit.spec
@@ -1,7 +1,9 @@
 
+%define pre rc1
+
 Name: qtwebkit
 Version: 2.3
-Release: 0.3.beta2%{?dist}
+Release: 0.4.%{pre}%{?dist}
 Summary: Qt WebKit bindings
 Group: System Environment/Libraries
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -20,9 +22,10 @@ URL: http://trac.webkit.org/wiki/QtWebKit
 # $ mv qtwebkit-2.2.2-source/include qtwebkit-2.2.2-source/Source/
 # $ tar cJf qtwebkit-2.2.2-source.tar.xz qtwebkit-2.2.2-source/
 ##
-# download from https://gitorious.org/webkit/qtwebkit-23/archive-tarball/qtwebkit-2.3-beta2b
+# download from
+# https://gitorious.org/webkit/qtwebkit-23/archive-tarball/qtwebkit-2.3-rc1
 # repack as .xz
-Source0:  qtwebkit-2.3-beta2.tar.xz
+Source0:  qtwebkit-%{version}-%{pre}.tar.xz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too
@@ -34,10 +37,7 @@ Patch3: qtwebkit-2.3-debuginfo.patch
 # tweak linker flags to minimize memory usage on "small" platforms
 Patch4: qtwebkit-2.3-save_memory.patch
 
-# don't disable fontconfig on production_build (linking fails)
-Patch5: qtwebkit-2.3-fontconfig.patch
-
-# use SYSTEM_MALLOC on ppc/ppc64, -g1 on ppc/ppc64 to reduce archive size 
+# use SYSTEM_MALLOC on ppc/ppc64
 Patch10: qtwebkit-ppc.patch
 
 # add missing function Double2Ints(), backport
@@ -99,7 +99,6 @@ Provides:  qt4-webkit-devel%{?_isa} = 2:%{version}-%{release}
 %patch1 -p1 -b .pluginpath
 %patch3 -p1 -b .debuginfo
 %patch4 -p1 -b .save_memory
-%patch5 -p1 -b .fontconfig
 %ifarch ppc ppc64
 %patch10 -p1 -b .system-malloc
 %patch11 -p1 -b .Double2Ints
@@ -162,6 +161,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Mar 05 2013 Rex Dieter <rdieter@fedoraproject.org> 2.3-0.4.rc1
+- 2.3-rc1
+
 * Tue Mar 05 2013 Than Ngo <than@redhat.com> - 2.3-0.3.beta2
 - add missing function Double2Ints() on ppc, backport
 
diff --git a/sources b/sources
index 6b7c619..c50f36f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e0a8e6dddc3f0f771432e54a5f3f2124  qtwebkit-2.3-beta2.tar.xz
+a32ff002794ec5b9e40b6c5fe965ade5  qtwebkit-2.3-rc1.tar.xz