[xiphos/f12/master] - Update to 3.1.4

[Deji Akingunola]

commit bd37db958fb6635e254478e8bfc7e876aabf7258
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Sun Nov 7 08:07:25 2010 -0500

    - Update to 3.1.4

 sources     |    2 +-
 xiphos.spec |   18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)
---
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 ce82c28..1d8f6ee 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -1,5 +1,5 @@
 Name:		xiphos 
-Version:	3.1.3
+Version:	3.1.4
 Release:	1%{?dist}
 Summary:	Bible study and research tool
 
@@ -9,7 +9,7 @@ URL:		http://xiphos.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/gnomesword/xiphos-%{version}.tar.gz
 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
@@ -21,6 +21,7 @@ BuildRequires:	dbus-glib-devel
 BuildRequires:	ImageMagick-c++-devel
 BuildRequires:	scrollkeeper
 BuildRequires:	perl(XML::Parser) intltool
+BuildRequires:	waf
 Requires:	yelp
 Requires(post):	scrollkeeper
 Requires(postun):	scrollkeeper
@@ -37,15 +38,16 @@ Project and elsewhere.
 %setup -q
 
 %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 \
@@ -80,6 +82,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
@@ -88,6 +91,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %_datadir/gnome/help/xiphos
 
 %changelog
+* Sun Nov 07 2010 Deji Akingunola <dakingun at gmail.com> - 3.1.4-1
+- Update to 3.1.4
+
 * Tue Mar 23 2010 Deji Akingunola <dakingun at gmail.com> - 3.1.3-1
 - New upstream version