[webkitgtk3] Update to 2.0.0, update BR versions, drop unused patches

[Tomas Popela]

commit 25d8f0c8fa1c04a1e0aca8dc966a64c00c294d44
Author: Tomas Popela <tpopela at redhat.com>
Date:   Wed Mar 27 12:47:29 2013 +0100

    Update to 2.0.0, update BR versions, drop unused patches

 .gitignore                    |    1 +
 sources                       |    2 +-
 webkit-1.11.2-includes.patch  |   11 ----------
 webkit-1.3.4-no-execmem.patch |   12 -----------
 webkitgtk3.spec               |   43 ++++++++++++++++++++---------------------
 5 files changed, 23 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9aebe8d..405fc95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@ webkit-1.3.3.tar.gz
 /webkitgtk-1.11.90.tar.xz
 /webkitgtk-1.11.91.tar.xz
 /webkitgtk-1.11.92.tar.xz
+/webkitgtk-2.0.0.tar.xz
diff --git a/sources b/sources
index d13faf1..a104b6a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-05ef324d92762b344be631817b2d19fb  webkitgtk-1.11.92.tar.xz
+fa231ba8c9cd33575b9692614324be21  webkitgtk-2.0.0.tar.xz
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index a467d1b..ee07d13 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -6,7 +6,7 @@
         cp -p %1  %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkitgtk3
-Version:        1.11.92
+Version:        2.0.0
 Release:        1%{?dist}
 Summary:        GTK+ Web content engine library
 
@@ -16,24 +16,21 @@ URL:            http://www.webkitgtk.org/
 
 Source0:        http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 
-Patch1:         webkit-1.3.4-no-execmem.patch
-Patch2:         webkit-1.1.14-nspluginwrapper.patch
+Patch0:         webkit-1.1.14-nspluginwrapper.patch
 # workarounds for non-JIT arches
 # https://bugs.webkit.org/show_bug.cgi?id=104270
-Patch4:         webkit-1.11.2-yarr.patch
-# https://bugs.webkit.org/show_bug.cgi?id=105295
-Patch5:         webkit-1.11.2-includes.patch
+Patch1:         webkit-1.11.2-yarr.patch
 # https://bugs.webkit.org/show_bug.cgi?id=103128
-Patch6:         webkit-1.11.2-Double2Ints.patch
-Patch7:         webkitgtk-1.11.5-libatomic.patch
-Patch8:         webkit-1.11.90-double2intsPPC32.patch
+Patch2:         webkit-1.11.2-Double2Ints.patch
+Patch3:         webkitgtk-1.11.5-libatomic.patch
+Patch4:         webkit-1.11.90-double2intsPPC32.patch
 
 BuildRequires:  bison
 BuildRequires:  cairo-devel
 BuildRequires:  chrpath
 BuildRequires:  enchant-devel
 BuildRequires:  flex
-BuildRequires:  fontconfig-devel
+BuildRequires:  fontconfig-devel >= 2.5
 BuildRequires:  freetype-devel
 BuildRequires:  geoclue-devel
 BuildRequires:  gettext
@@ -41,10 +38,11 @@ BuildRequires:  gperf
 BuildRequires:  gstreamer1-devel
 BuildRequires:  gstreamer1-plugins-base-devel
 BuildRequires:  gtk2-devel
-BuildRequires:  gtk3-devel >= 3.0
+BuildRequires:  gtk3-devel >= 3.6
 BuildRequires:  gtk-doc
+BuildRequires:  glib2-devel >= 2.36.0
 BuildRequires:  harfbuzz-devel
-BuildRequires:  libsoup-devel >= 2.37.2.1
+BuildRequires:  libsoup-devel >= 2.42.0
 BuildRequires:  libicu-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel
@@ -54,7 +52,7 @@ BuildRequires:  libxslt-devel
 BuildRequires:  libXt-devel
 BuildRequires:  pcre-devel
 BuildRequires:  sqlite-devel
-BuildRequires:  gobject-introspection-devel
+BuildRequires:  gobject-introspection-devel >= 1.32.0
 BuildRequires:  perl-Switch
 BuildRequires:  ruby
 BuildRequires:  mesa-libGL-devel
@@ -91,15 +89,12 @@ This package contains developer documentation for %{name}.
 
 %prep
 %setup -qn "webkitgtk-%{version}"
-# tbzatek - doesn't apply, is this fixed?
-# %patch1 -p1 -b .no-execmem
-%patch2 -p1 -b .nspluginwrapper
-%patch4 -p1 -b .yarr
-%patch5 -p1 -b .includes
-%patch6 -p1 -b .double2ints
+%patch0 -p1 -b .nspluginwrapper
+%patch1 -p1 -b .yarr
+%patch2 -p1 -b .double2ints
 %ifarch ppc
-%patch7 -p1 -b .libatomic
-%patch8 -p1 -b .double2intsPPC32
+%patch3 -p1 -b .libatomic
+%patch4 -p1 -b .double2intsPPC32
 %endif
 
 %build
@@ -121,7 +116,6 @@ This package contains developer documentation for %{name}.
 # https://bugs.webkit.org/show_bug.cgi?id=91154
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 
-# explicitly disable JIT on ARM https://bugs.webkit.org/show_bug.cgi?id=85076
 CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure                                                   \
                         --with-gtk=3.0                          \
 %ifarch s390 s390x ppc ppc64
@@ -221,6 +215,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 
 
 %changelog
+* Wed Mar 27 2013 Tomas Popela <tpopela at redhat.com> - 2.0.0-1
+- Update to 2.0.0
+- Update BR versions
+- Drop unused patches
+
 * Wed Mar 20 2013 Kalev Lember <kalevlember at gmail.com> - 1.11.92-1
 - Update to 1.11.92