[xiphos] - Update to 3.1.4

[Deji Akingunola]

commit d6a177f0b462b642480e61ca8c6ad141b4599572
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Fri Oct 22 23:04:02 2010 -0400

    - Update to 3.1.4

 .gitignore                         |    1 +
 sources                            |    2 +-
 xiphos-gtkhtml3-versioned-pc.patch |   11 --------
 xiphos-jump-to-anchor-fix.patch    |   47 ------------------------------------
 xiphos.spec                        |   24 ++++++++++--------
 5 files changed, 15 insertions(+), 70 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b10a02d..b591296 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 xiphos-3.1.3.tar.gz
+/xiphos-3.1.4.tar.gz
diff --git a/sources b/sources
index 247dfe4..dcdb5fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aaded6bc81b29935edd989d204928ba3  xiphos-3.1.3.tar.gz
+4d6f7805c4c8185f5c4ac3bd95fc705a  xiphos-3.1.4.tar.gz
diff --git a/xiphos.spec b/xiphos.spec
index 059a20d..f360607 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -1,17 +1,15 @@
 Name:		xiphos 
-Version:	3.1.3
-Release:	3%{?dist}
+Version:	3.1.4
+Release:	1%{?dist}
 Summary:	Bible study and research tool
 
 Group:		Applications/Text
 License:	GPLv2+
 URL:		http://xiphos.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/gnomesword/xiphos-%{version}.tar.gz
-Patch0:		xiphos-jump-to-anchor-fix.patch
-Patch1:		xiphos-gtkhtml3-versioned-pc.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
@@ -23,6 +21,7 @@ BuildRequires:	dbus-glib-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,19 +34,18 @@ Project and elsewhere.
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0
 
 %build
-%configure
-make %{?_smp_mflags}
+CFLAGS='%{optflags}' CXXFLAGS='%{optflags}' ./waf configure	\
+	--prefix %{_prefix} --debug-level optimized --enable-delint
+ 
+./waf build -v
 
 %install
 rm -rf %buildroot
-make install DESTDIR=%buildroot
+./waf install --destdir %{buildroot}
 
 desktop-file-install --delete-original \
-	--remove-category=Application	\
 	--add-category=X-Bible		\
 	--add-category=X-Religion	\
 	--dir=%buildroot%_datadir/applications \
@@ -78,6 +76,7 @@ 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
@@ -86,6 +85,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %_datadir/gnome/help/xiphos
 
 %changelog
+* Sun Oct 17 2010 Deji Akingunola <dakingun at gmail.com> - 3.1.4-1
+- Update to 3.1.4
+
 * Fri Jul 16 2010 Deji Akingunola <dakingun at gmail.com> - 3.1.3-3
 - Rebuild (with a small patch) for gtkhtml3-3.31.5.