rpms/WebKit/F-7 .cvsignore, 1.2, 1.3 WebKit.spec, 1.1, 1.2 sources, 1.2, 1.3

Peter Gordon (pgordon) fedora-extras-commits at redhat.com
Wed Mar 5 04:04:04 UTC 2008


Author: pgordon

Update of /cvs/pkgs/rpms/WebKit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12028/F-7

Modified Files:
	.cvsignore WebKit.spec sources 
Log Message:
Sync with devel, updating to SVN 30667 and fixing some bugs.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Dec 2007 00:42:30 -0000	1.2
+++ .cvsignore	5 Mar 2008 04:03:26 -0000	1.3
@@ -1 +1 @@
-WebKit-r28482.tar.bz2
+WebKit-r30667.tar.bz2


Index: WebKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/F-7/WebKit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WebKit.spec	12 Dec 2007 00:42:30 -0000	1.1
+++ WebKit.spec	5 Mar 2008 04:03:26 -0000	1.2
@@ -3,11 +3,11 @@
 	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	28482
+%define		svn_revision	30667
 
 Name:		WebKit
 Version:	1.0.0
-Release:	0.3.svn%{svn_revision}%{?dist}
+Release:	0.6.svn%{svn_revision}%{?dist}
 Summary:	Web content engine library
 
 Group:		Development/Libraries
@@ -18,11 +18,6 @@
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## Currently does not build by default on PPC due to some assembly issues in
-## the JavaScriptCore/wtf/TCSystemAlloc.cpp code. We disable the assembly
-## usage and opt for using the portable pthread implementation instead.
-Patch0: 	%{name}-TCSpinLock-use-pthread-stubs.patch
-
 BuildRequires:	bison
 BuildRequires:	curl-devel
 BuildRequires:	flex
@@ -35,7 +30,7 @@
 BuildRequires:	sqlite-devel
 
 %description 
-WebKit is an open source web browser engine.    
+WebKit is an open source web browser engine.
 
 %package	gtk
 Summary:	GTK+ port of WebKit 
@@ -98,7 +93,6 @@
 
 %prep
 %setup -qn "%{name}-r%{svn_revision}"
-%patch0 -p0 -b .TCSpinLock-pthread-stubs
 
 %build
 ## We don't like pre-built binaries, especially ones for other OSes. =)
@@ -119,7 +113,7 @@
 		VERSION=%{version}			\
 		CONFIG-=qt				\
 		CONFIG+=gtk-port			\
-		WEBKIT_INC_DIR=%{_includedir}/WebKit	\
+		WEBKIT_INC_DIR=%{_includedir}/webkit	\
 		WEBKIT_LIB_DIR=%{_libdir}		\
 		../WebKit.pro
 	make %{?_smp_mflags}
@@ -138,7 +132,6 @@
 		VERSION=%{version}			\
 		CONFIG-=gtk				\
 		CONFIG+=qt-port				\
-		WEBKIT_INC_DIR=%{_includedir}/WebKit	\
 		WEBKIT_LIB_DIR=%{_libdir}		\
 		../WebKit.pro
 	make %{?_smp_mflags}
@@ -168,6 +161,7 @@
 
 ## 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 WebKit/LICENSE
@@ -176,12 +170,13 @@
 %add_to_doc_files WebCore/icu/LICENSE
 
 %add_to_doc_files JavaScriptCore/icu/README
-%add_to_doc_files WebCore/README
 %add_to_doc_files WebCore/icu/README
 
 %add_to_doc_files JavaScriptCore/AUTHORS
 %add_to_doc_files JavaScriptCore/pcre/AUTHORS   
 
+%add_to_doc_files JavaScriptCore/THANKS
+
 
 %clean
 rm -rf %{buildroot}
@@ -206,8 +201,10 @@
 
 %files	gtk-devel
 %defattr(-,root,root,-)
-%{_includedir}/WebKit
-%{_libdir}/libWebKitGtk.prl
+## The .prl file stores information only on how the library was built, and is
+## not needed for linking. 
+%exclude %{_libdir}/libWebKitGtk.prl
+%{_includedir}/webkit
 %{_libdir}/libWebKitGtk.so
 %{_libdir}/pkgconfig/WebKitGtk.pc
 
@@ -232,6 +229,17 @@
 
 
 %changelog
+* Sat Mar 01 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.6.svn30667
+- Fix include directory naming. Resolves: bug 435561 (Header file <> header
+  file location mismatch)
+- Remove qt4-devel runtime dependency and .prl file from WebKit-gtk-devel.
+  Resolves: bug 433138 (WebKit-gtk-devel has a requirement on qt4-devel) 
+
+* Fri Feb 29 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.5.svn30667
+- Update to new upstream snapshot (SVN 30667)
+- Drop TCSpinLock pthread workaround (fixed upstream):
+  - TCSpinLock-use-pthread-stubs.patch
+
 * Thu Dec 06 2007 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.3.svn28482
 - Add proper %%defattr line to qt, qt-devel, and doc subpackages.
 - Add patch to forcibly build the TCSpinLock code using the pthread
@@ -248,4 +256,4 @@
 - Add various AUTHORS, README, and LICENSE files (via the doc subpackage). 
 
 * Tue Dec 04 2007 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.1.svn28383
-- Initial packaging for Fedora.
\ No newline at end of file
+- Initial packaging for Fedora.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Dec 2007 00:42:30 -0000	1.2
+++ sources	5 Mar 2008 04:03:26 -0000	1.3
@@ -1 +1 @@
-e2e8dcae34e6c06aa410c3abefc3fff0  WebKit-r28482.tar.bz2
+d5047727add37bdbba6a4642b0a9c0f4  WebKit-r30667.tar.bz2




More information about the fedora-extras-commits mailing list