Bug 518003

Hi,

currently, only WebKit-1.0 is available in Fedora 10. This unfortunately blocks updating gimp to 2.6.7 as this needs 1.1.0 as a minimum.

+++ This bug was initially created as a clone of Bug #488541 +++

WebKit 1.1.1 has been released upstream. 

I did a hacky rebuild here to test with, and midori at least works great with this version. 

Here's the spec I used. I ran into issues with doc files. I don't quite understand why you are packaging the doc files via a macro instead of just marking them %doc. 

Anyhow, feel free to use any or part of this and update to 1.1.1: 

--- WebKit.spec	3 Mar 2009 18:57:53 -0000	1.28
+++ WebKit.spec	4 Mar 2009 18:48:34 -0000
@@ -3,7 +3,7 @@
 	cp -p %1  %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') \
 	echo %%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') >> docfiles.list
 
-%define		svn_revision	41071
+#define		svn_revision	41071
 
 ## Optional build modifications...
 ## --with debug: Enable more verbose debugging. Makes runtime a bit slower.
@@ -35,15 +35,15 @@
 %bcond_with	wml
 
 Name:		WebKit
-Version:	1.1.0
-Release:	0.21.svn%{svn_revision}%{?dist}
+Version:	1.1.1
+Release:	1%{?dist}
 Summary:	Web content engine library
 
 Group:		Development/Libraries
 License:	LGPLv2+ and BSD
 URL:		http://webkit.org/
 
-Source0:	http://nightly.webkit.org/files/trunk/src/WebKit-r%{svn_revision}.tar.bz2
+Source0:	http://cafe.minaslivre.org/webkit/webkit-1.1.1.tar.gz
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -112,16 +112,16 @@
 
 
 %prep
-%setup -qn "%{name}-r%{svn_revision}"
+%setup -qn "webkit-%{version}"
 
 
 %build
 ## We don't like pre-built binaries, especially ones for other OSes. =)
-rm -r WebKitLibraries/{*.a,win/}
+#rm -r WebKitLibraries/{*.a,win/}
 
 ## Don't call configure automatically
-sed -i.conf -e '$d' autogen.sh
-./autogen.sh
+#sed -i.conf -e '$d' autogen.sh
+#./autogen.sh
 
 %configure							\
 			--with-http-backend=soup		\
@@ -150,15 +150,16 @@
 ## Finally, copy over and rename the various files for %%doc inclusion.
 rm -f docfiles.list
 %add_to_doc_files JavaScriptCore/COPYING.LIB
-%add_to_doc_files JavaScriptCore/icu/LICENSE
-%add_to_doc_files JavaScriptGlue/LICENSE
+#add_to_doc_files JavaScriptCore/icu/LICENSE
+#add_to_doc_files JavaScriptGlue/LICENSE
 %add_to_doc_files WebKit/LICENSE
 %add_to_doc_files WebCore/LICENSE-APPLE
 %add_to_doc_files WebCore/LICENSE-LGPL-2.1
 %add_to_doc_files WebCore/icu/LICENSE
 
-%add_to_doc_files JavaScriptCore/icu/README
-%add_to_doc_files WebCore/icu/README
+rm -f JavaScriptCore/icu/README
+#add_to_doc_files WebCore/icu/README
+%add_to_doc_files JavaScriptCore/COPYING.LIB
 
 %add_to_doc_files JavaScriptCore/AUTHORS
 %add_to_doc_files JavaScriptCore/pcre/AUTHORS   
@@ -196,6 +197,9 @@
 
 
 %changelog
+* Wed Mar  4 2009 Kevin Fenzi <kevin> - 1.1.1-1
+- Update to 1.1.1
+
 * Wed Mar  4 2009 Mamoru Tasaka <mtasaka.u-tokyo.ac.jp> - 1.1.0-0.21.svn41071
 - Compile libJavaScriptCore.a with -fno-strict-aliasing to
   do workaround for #488112

--- Additional comment from martin.sourada on 2009-03-05 11:57:38 EDT ---

I'd also suggest removal of --with-http-backend=soup because there is no other http backend supported in WebKit/GTK now and I'd also add --enable-gnomekeyring to have integration with gnome keyring for web auth. Here's my diff:

6c6
< #%define		svn_revision	41071
---
> %define		svn_revision	41071
29d28
< ##
39,41c38,39
< Version:	1.1.1
< Release:	0.1%{?dist}
< #Release:	0.20.svn%{svn_revision}%{?dist}
---
> Version:	1.1.0
> Release:	0.21.svn%{svn_revision}%{?dist}
48,49c46
< #Source0:	http://nightly.webkit.org/files/trunk/src/WebKit-r%{svn_revision}.tar.bz2
< Source0:        http://cafe.minaslivre.org/webkit/webkit-%{version}.tar.gz
---
> Source0:	http://nightly.webkit.org/files/trunk/src/WebKit-r%{svn_revision}.tar.bz2
65d61
< BuildRequires:  gnome-keyring-devel
119,120c115
< #%setup -qn "%{name}-r%{svn_revision}"
< %setup -qn webkit-%{version}
---
> %setup -qn "%{name}-r%{svn_revision}"
125c120
< #rm -r WebKitLibraries/{*.a,win/}
---
> rm -r WebKitLibraries/{*.a,win/}
128,129c123,124
< #sed -i.conf -e '$d' autogen.sh
< #./autogen.sh
---
> sed -i.conf -e '$d' autogen.sh
> ./autogen.sh
132c127
< 			--enable-gnomekeyring    		\
---
> 			--with-http-backend=soup		\
155a154
> %add_to_doc_files JavaScriptGlue/LICENSE
161a161
> %add_to_doc_files WebCore/icu/README

And here's my test build:
http://mso.fedorapeople.org/packages/rawhide/i586/WebKit-gtk-1.1.1-0.1.fc11.i586.rpm
http://mso.fedorapeople.org/packages/rawhide/i586/WebKit-gtk-devel-1.1.1-0.1.fc11.i586.rpm
http://mso.fedorapeople.org/packages/rawhide/i586/WebKit-doc-1.1.1-0.1.fc11.i586.rpm

--- Additional comment from kevin on 2009-03-05 17:34:40 EDT ---

That looks pretty good to me. 

Personally, I would leave the svn version of things in place and commented, so moving back to a svn release later would be simple to do.

--- Additional comment from kevin on 2009-03-05 17:45:57 EDT ---

Oh, one more issue: 

I read on irc from one of the webkit devs that the offical name is now: 

WebKitGTK+

So, we may wish to rename at whatever point that upstream starts widely using this name.

--- Additional comment from peter on 2009-03-05 21:45:36 EDT ---

Thanks, Kevin & Mamoru-san. I'll take care of this tonight. :)

--- Additional comment from peter on 2009-03-08 01:48:09 EDT ---

I've bumped the package in Rawhide, including the various suggestions and changes noted in this bug report. Thanks, and Regards. :)

Kevin, to answer your initial inquiry of why I'm using a seperate macro instead of just plain-old-normal %doc:  Most of the files in the documentation are of the same name (such as "COPYING.LIB" or "README") whose only difference is that they are within seperate subdirectories of the source tree. The %add_to_doc_files macro that I've created simply takes the name of the subdirectory and includes that (prepended) with the name of the file, so as not to have conflicts in the documentation's various filenames.