[xiphos] Update to svn snapshot from the webkit branch for gtk3 support

[Deji Akingunola]

commit 009f91988ec6a7daf5f6308d3c2aafdae693ae4f
Author: Deji Akingunola <dakingun at mail.com>
Date:   Mon Jun 27 22:04:32 2011 -0400

    Update to svn snapshot from the webkit branch for gtk3 support

 sources                       |    2 +-
 xiphos-rawhide-gtkhtml3.patch |   45 -----------------------------------------
 xiphos.spec                   |   23 ++++++++++-----------
 3 files changed, 12 insertions(+), 58 deletions(-)
---
diff --git a/sources b/sources
index 56ca46a..94b9891 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d9e20d1d437889866a0bcd3dfdf38ede  xiphos-20110614svn4172.tar.bz2
+0f2133080c6f34977c6452650ca3a491  xiphos-20110627svn4220.tar.bz2
diff --git a/xiphos.spec b/xiphos.spec
index 4606a84..f6632fe 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -1,29 +1,26 @@
 Name:		xiphos 
 Version:	3.1.4
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Bible study and research tool
 
 Group:		Applications/Text
 License:	GPLv2+
 URL:		http://xiphos.org/
-#Source0:	http://downloads.sourceforge.net/project/gnomesword/Xiphos/%{version}/xiphos-%{version}.tar.gz
-Source0: xiphos-20110614svn4172.tar.bz2
-Patch0:		xiphos-rawhide-gtkhtml3.patch
+#Source0:	http://downloads.sourceforge.net/gnomesword/xiphos-%{version}.tar.gz
+Source0:	xiphos-20110627svn4220.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	sword-devel >= 1.6.0
 BuildRequires:	gettext
 BuildRequires:	desktop-file-utils
 BuildRequires:	gnome-doc-utils
-BuildRequires:	gtkhtml2-devel
-BuildRequires:	xulrunner-devel
-BuildRequires:	libglade2-devel libgnomeprintui22-devel
+BuildRequires:	gtkhtml3-devel
+BuildRequires:	webkitgtk3-devel
 BuildRequires:	libgsf-devel
 BuildRequires:	dbus-glib-devel
-BuildRequires:	ImageMagick-c++-devel
+#BuildRequires:	ImageMagick-c++-devel
 BuildRequires:	perl(XML::Parser) intltool
 BuildRequires:	rarian-compat
-BuildRequires:	waf
 Requires:	yelp
 Obsoletes:	gnomesword < 2.4.2
 Provides:	gnomesword = %{version}-%{release}
@@ -35,12 +32,11 @@ environment for reading, study, and research using modules from The SWORD
 Project and elsewhere.
 
 %prep
-%setup -q -n %{name}
-%patch0 -p1 -b .gtkhtml3
+%setup -q -n %{name}-svn4220
 
 %build
 CFLAGS='%{optflags}' CXXFLAGS='%{optflags}' ./waf configure	\
-	--prefix %{_prefix} --debug-level optimized --enable-delint
+	--prefix %{_prefix} --enable-webkit
  
 ./waf build -v
 
@@ -88,6 +84,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %_datadir/gnome/help/xiphos
 
 %changelog
+* Mon Jun 27 2011 Deji Akingunola <dakingun at gmail.com> - 3.1.4-6
+- Update to svn snapshot from the webkit branch for gtk3 support
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild