rpms/WebKit/devel .cvsignore, 1.7, 1.8 WebKit.spec, 1.16, 1.17 sources, 1.7, 1.8

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/pkgs/rpms/WebKit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26459

Modified Files:
	.cvsignore WebKit.spec sources 
Log Message:
Update to SVN 34655, add build-time options (default off) for some of the debugging and experimental features.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Jun 2008 05:15:10 -0000	1.7
+++ .cvsignore	20 Jun 2008 08:02:31 -0000	1.8
@@ -1 +1 @@
-WebKit-r34279.tar.bz2
+WebKit-r34655.tar.bz2


Index: WebKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/devel/WebKit.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- WebKit.spec	3 Jun 2008 10:42:25 -0000	1.16
+++ WebKit.spec	20 Jun 2008 08:02:31 -0000	1.17
@@ -3,11 +3,32 @@
 	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	34279
+%define		svn_revision	34655
+
+## Optional build modifications...
+## --with debug: Enable more verbose debugging. Makes runtime a bit slower.
+##	(Default: No)
+##
+## --with html5video: HTML5 video element support using Gstreamer
+##	(Default: No) 
+##
+## --with libsoup: Use libsoup instead of cURL as the HTTP backend
+##	(Default: No - use cURL)
+##
+## --with pango: Use Pango instead of freetype2 as the font renderer
+##	(Default: No - use freetype2)
+##
+## --with svg: Experimental SVG support (filters)
+##	(Default: No) 
+%bcond_with 	debug
+%bcond_with 	html5video	
+%bcond_with 	libsoup
+%bcond_with 	pango	
+%bcond_with 	svg
 
 Name:		WebKit
 Version:	1.0.0
-Release:	0.12.svn%{svn_revision}%{?dist}
+Release:	0.13.svn%{svn_revision}%{?dist}
 Summary:	Web content engine library
 
 Group:		Development/Libraries
@@ -28,10 +49,30 @@
 BuildRequires:	libtool
 BuildRequires:	libxslt-devel
 BuildRequires:	libXt-devel
-BuildRequires:	pango-devel
 BuildRequires:	pcre-devel
 BuildRequires:	sqlite-devel
 
+## Conditional dependencies...
+%if %{with html5video}
+BuildRequires:	gnome-vfs2-devel
+BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-plugins-base-devel
+%endif
+
+%if %{with libsoup}
+BuildRequires:	libsoup >= 2.23
+%else
+BuildRequires:	curl-devel
+%endif
+
+%if %{with pango}
+BuildRequires:	pango-devel
+%else
+BuildRequires:	cairo-devel
+BuildRequires:	fontconfig-devel
+BuildRequires:	freetype-devel
+%endif
+
 %description 
 WebKit is an open source web browser engine.
 
@@ -83,8 +124,14 @@
 ## Don't call configure automatically
 sed -i.conf -e '$d' autogen.sh
 ./autogen.sh
-%configure --with-font-backend=pango --enable-icon-database
-make %{?_smp_mflags} -k
+%configure							\
+%{?with_debug:		--enable-debug			}	\
+%{?with_html5video:	--enable-video			}	\
+%{?with_libsoup:	--with-http-backend=soup	}	\
+%{?with_pango:		--with-font-backend=pango	}	\
+%{?with_svg:		--enable-svg-filters		}
+	
+make %{?_smp_mflags}
 
 
 %install
@@ -127,6 +174,7 @@
 %doc
 %{_libdir}/libwebkit-1.0.so.*
 %{_libexecdir}/WebKit/
+%{_bindir}/jsc
 
 %files	gtk-devel
 %defattr(-,root,root,-)
@@ -140,6 +188,11 @@
 
 
 %changelog
+* Thu Jun 12 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.13.svn34655
+- Update to new upstream snapshot (SVN 34655)
+- Add some build-time conditionals for non-default features: debug, 
+  html5video, libsoup, pango, svg. 
+
 * Tue Jun  3 2008 Caolán McNamara <caolanm at redhat.com> - 1.0.0-0.12.svn34279
 - rebuild for new icu
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Jun 2008 05:15:10 -0000	1.7
+++ sources	20 Jun 2008 08:02:31 -0000	1.8
@@ -1 +1 @@
-dd20db02fbe7b60b3c5580287d4996a5  WebKit-r34279.tar.bz2
+0c4dcb3f69d9bd63817005a11a797425  WebKit-r34655.tar.bz2