- Update to version 1.6.0

.cvsignore

@@ -1 +1 @@
-sword-1.5.11.tar.gz
+sword-1.6.0.tar.gz

sources

@@ -1 +1 @@
-84a13fd3cf767902de91368424f30baa  sword-1.5.11.tar.gz
+292ca38b2427168b19d629b48a428dde  sword-1.6.0.tar.gz

sword-gcc44.patch

@@ -1,10 +0,0 @@
---- utilities/emptyvss.cpp	2005-11-20 01:20:30.000000000 -0500
-+++ utilities/emptyvss.cpp.new	2009-02-04 13:27:42.517817482 -0500
-@@ -2,6 +2,7 @@
- #include <swmodule.h>
- #include <versekey.h>
- #include <iostream>
-+#include <cstdio>
- 
- #ifndef NO_SWORD_NAMESPACE
- using sword::SWMgr;

sword.spec

@@ -1,13 +1,12 @@
 Name:           sword           
-Version:        1.5.11
+Version:        1.6.0
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        Free Bible Software Project
 
 Group:          System Environment/Libraries
 License:        GPLv2
 URL:            http://www.crosswire.org/sword/
 Source0:        http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-%{version}.tar.gz
-Patch0:		sword-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  openssl-devel
 BuildRequires:  curl-devel
@@ -15,6 +14,7 @@ BuildRequires:  zlib-devel
 BuildRequires:  libidn-devel
 BuildRequires:  libicu-devel icu
 BuildRequires:  clucene-core-devel
+BuildRequires:  cppunit-devel
 
 %description
 The SWORD Project is the CrossWire Bible Society's free Bible software
@@ -40,10 +40,11 @@ that uses the sword API, such as Gnomesword or Bibletime.
 
 %prep
 %setup -q
-%patch0 -p0 -b .gcc44
 
 %build
-%configure --disable-static --with-icu --with-lucene
+%configure --disable-static --with-icu
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 
@@ -81,6 +82,9 @@ rm -rf %{buildroot}
 %{_libdir}/libsword.so
 
 %changelog
+* Thu May 14 2009 Deji Akingunola <dakingun@gmail.com> - 1.6.0-1
+- Update to version 1.6.0
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.11-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild