diff --git a/.gitignore b/.gitignore index ee69715..d0cd386 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ webkit-1.3.2.tar.gz /webkit-1.3.12.tar.gz /webkit-1.3.13.tar.gz /webkit-1.4.0.tar.gz +/webkit-1.4.1.tar.gz diff --git a/sources b/sources index c94a8c4..3eddb56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -10c969db3b5484c71df1aa9a338377ff webkit-1.4.0.tar.gz +c1a4f732a77d6f8197437b50678d3dbc webkit-1.4.1.tar.gz diff --git a/webkit-1.3.13-gcc46-preprocessor.patch b/webkit-1.3.13-gcc46-preprocessor.patch deleted file mode 100644 index b34c3b8..0000000 --- a/webkit-1.3.13-gcc46-preprocessor.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur webkit-1.3.13.orig/Source/WebCore/dom/make_names.pl webkit-1.3.13/Source/WebCore/dom/make_names.pl ---- webkit-1.3.13.orig/Source/WebCore/dom/make_names.pl 2011-03-21 12:42:34.000000000 -0600 -+++ webkit-1.3.13/Source/WebCore/dom/make_names.pl 2011-04-15 21:55:42.963217070 -0600 -@@ -65,7 +65,7 @@ - } else { - $gccLocation = "/usr/bin/gcc"; - } --my $preprocessor = $gccLocation . " -E -P -x c++"; -+my $preprocessor = $gccLocation . " -E -x c++"; - - GetOptions( - 'tags=s' => \$tagsFile, diff --git a/webkitgtk.spec b/webkitgtk.spec index 6b3f8d1..09364f6 100644 --- a/webkitgtk.spec +++ b/webkitgtk.spec @@ -34,7 +34,7 @@ %bcond_with wml Name: webkitgtk -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -55,7 +55,6 @@ Source0: http://www.webkitgtk.org/webkit-%{version}.tar.gz ## bug. :) Patch1: webkit-1.3.12-no-execmem.patch Patch2: webkit-1.3.10-nspluginwrapper.patch -Patch3: webkit-1.3.13-gcc46-preprocessor.patch BuildRequires: bison BuildRequires: chrpath @@ -119,7 +118,6 @@ LICENSE, README, and AUTHORS files. %setup -qn "webkit-%{version}" %patch1 -p1 -b .no-execmem %patch2 -p1 -b .nspluginwrapper -%patch3 -p1 -b .gcc46-preprocessor %build %ifarch s390 @@ -208,6 +206,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Sat Jun 11 2011 Kevin Fenzi - 1.4.1-1 +- Update to 1.4.1 + * Tue Apr 26 2011 Kevin Fenzi - 1.4.0-1 - Update to 1.4.0 stable release.