[xiphos/el6] Update to version 3.1.5

[Deji Akingunola]

commit cd9b45df536b15c828af06626a806f58235a6858
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Thu Mar 8 07:04:47 2012 -0500

    Update to version 3.1.5

 sources                         |    2 +-
 xiphos-jump-to-anchor-fix.patch |   47 ---------------------------------------
 xiphos.spec                     |   31 ++++++++++++++-----------
 3 files changed, 18 insertions(+), 62 deletions(-)
---
diff --git a/sources b/sources
index 247dfe4..0aa166e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aaded6bc81b29935edd989d204928ba3  xiphos-3.1.3.tar.gz
+df35b8d7b077565254ba82190c0cc2c7  xiphos-3.1.5.tar.gz
diff --git a/xiphos.spec b/xiphos.spec
index ebed314..22a4074 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -1,25 +1,24 @@
 Name:		xiphos 
-Version:	3.1.3
-Release:	2%{?dist}
+Version:	3.1.5
+Release:	1%{?dist}
 Summary:	Bible study and research tool
 
 Group:		Applications/Text
 License:	GPLv2+
-URL:		http://xiphos.sourceforge.net/
+URL:		http://xiphos.org/
 Source0:	http://downloads.sourceforge.net/gnomesword/xiphos-%{version}.tar.gz
-Patch0:		xiphos-jump-to-anchor-fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	sword-devel >= 1.5.11
+BuildRequires:	sword-devel >= 1.6.0
 BuildRequires:	gettext
 BuildRequires:	desktop-file-utils
 BuildRequires:	gnome-doc-utils
-BuildRequires:	gtkhtml3-devel
-BuildRequires:	xulrunner-devel
-BuildRequires:	libglade2-devel libgnomeprintui22-devel
+BuildRequires:	gtkhtml3-devel GConf2-devel libglade2-devel
+BuildRequires:	webkitgtk-devel
+BuildRequires:	libgnomeprintui22-devel
 BuildRequires:	libgsf-devel
 BuildRequires:	dbus-glib-devel
-BuildRequires:	ImageMagick-c++-devel
+#BuildRequires:	ImageMagick-c++-devel
 BuildRequires:	perl(XML::Parser) intltool
 BuildRequires:	rarian-compat
 Requires:	yelp
@@ -34,15 +33,16 @@ Project and elsewhere.
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
-%configure
-make %{?_smp_mflags}
+CFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1' CXXFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1' ./waf configure	\
+	--prefix %{_prefix} --backend webkit
+ 
+./waf build -v
 
 %install
 rm -rf %buildroot
-make install DESTDIR=%buildroot
+./waf install --destdir %{buildroot}
 
 desktop-file-install --delete-original \
 	--remove-category=Application	\
@@ -76,14 +76,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README RELEASE-NOTES TODO Xiphos.ogg
 %_bindir/xiphos
+%_bindir/xiphos-nav
 %_datadir/xiphos/
-%_datadir/pixmaps/xiphos
 %_datadir/icons/hicolor/scalable/apps/xiphos.svg
 %_datadir/omf/xiphos/
 %_datadir/applications/xiphos.desktop
 %_datadir/gnome/help/xiphos
 
 %changelog
+* Thu Mar 08 2012 Deji Akingunola <dakingun at gmail.com> - 3.1.5-1
+- Update to version 3.1.5
+
 * Thu Jul 01 2010 Deji Akingunola <dakingun at gmail.com> - 3.1.3-2
 - Apply Karl Kleinpaste patch to fix the jump-to-anchor failure.