rpms/WebKit/devel .cvsignore, 1.13, 1.14 WebKit.spec, 1.28, 1.29 sources, 1.13, 1.14

[Peter Gordon]

Author: pgordon

Update of /cvs/pkgs/rpms/WebKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16097

Modified Files:
	.cvsignore WebKit.spec sources 
Log Message:
Update to 1.1.1 - some ABI changes included (\!)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	21 Feb 2009 01:32:03 -0000	1.13
+++ .cvsignore	8 Mar 2009 02:45:34 -0000	1.14
@@ -1 +1 @@
-WebKit-r41071.tar.bz2
+webkit-1.1.1.tar.gz


Index: WebKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/devel/WebKit.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- WebKit.spec	3 Mar 2009 18:57:53 -0000	1.28
+++ WebKit.spec	8 Mar 2009 02:45:34 -0000	1.29
@@ -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,23 +35,25 @@
 %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://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)
 
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	gperf
+BuildRequires:	gnome-keyring-devel
 BuildRequires:	gtk2-devel
-BuildRequires:	libsoup-devel >= 2.23
+BuildRequires:	libsoup-devel >= 2.25.91
 BuildRequires:	libicu-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libtool
@@ -112,19 +114,17 @@
 
 
 %prep
-%setup -qn "%{name}-r%{svn_revision}"
+#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/}
-
 ## 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		\
+			--enable-gnomekeyring			\
 %{?with_debug:		--enable-debug			}	\
 %{?with_html5video:	--enable-video			}	\
 %{?with_jit:		--enable-jit			}	\
@@ -149,16 +149,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/COPYING.LIB
+#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
+#add_to_doc_files JavaScriptCore/icu/README
+#add_to_doc_files WebCore/icu/README
 
 %add_to_doc_files JavaScriptCore/AUTHORS
 %add_to_doc_files JavaScriptCore/pcre/AUTHORS   
@@ -196,6 +196,10 @@
 
 
 %changelog
+* Sat Mar 07 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.1-1
+- Update to new upstream release (1.1.1), includes a soname bump.
+- Enable gnome-keyring support.
+
 * Wed Mar  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.1.0-0.21.svn41071
 - Compile libJavaScriptCore.a with -fno-strict-aliasing to
   do workaround for #488112


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	21 Feb 2009 01:32:03 -0000	1.13
+++ sources	8 Mar 2009 02:45:34 -0000	1.14
@@ -1 +1 @@
-3472abb3e3af9db37d1edf457401283e  WebKit-r41071.tar.bz2
+d3a5d7233beab310e9d3e5568fae49a1  webkit-1.1.1.tar.gz