From e44a67afb88f2bf3c5bc76d148c0b7e23989f850 Mon Sep 17 00:00:00 2001
From: Deji Akingunola <deji@fedoraproject.org>
Date: May 27 2008 02:05:15 +0000
Subject: - Update to version 1.5.11


---

diff --git a/.cvsignore b/.cvsignore
index 8a0422a..c9a22ce 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-sword-1.5.10.tar.gz
+sword-1.5.11.tar.gz
diff --git a/sources b/sources
index 073042e..e944719 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c920f2a3ee72040df8a8e105ad840df  sword-1.5.10.tar.gz
+84a13fd3cf767902de91368424f30baa  sword-1.5.11.tar.gz
diff --git a/sword-diatheke.patch b/sword-diatheke.patch
deleted file mode 100644
index eeba741..0000000
--- a/sword-diatheke.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- utilities/diatheke/cgi/diatheke.pl	2005-05-25 07:56:49.000000000 -0400
-+++ utilities/diatheke/cgi/diatheke.pl.new	2008-02-20 22:46:57.000000000 -0500
-@@ -110,8 +110,7 @@
- 	    $range = $mydata;
- 	    $range =~ tr/+/ /;
- 	    $range =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
--	    $range = "-r \"$range\"";
--            $range = shell_escape($range);
-+	    $range = "-r '" . shell_escape($range) . "'";
- 	}
- 
- 	elsif ($varname eq "strongs") {
diff --git a/sword-gcc43.patch b/sword-gcc43.patch
deleted file mode 100644
index 8917a2d..0000000
--- a/sword-gcc43.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- src/modules/filters/gbfwordjs.cpp	2006-11-25 16:29:46.000000000 -0500
-+++ src/modules/filters/gbfwordjs.cpp.new	2008-01-10 13:11:20.000000000 -0500
-@@ -6,6 +6,7 @@
- 
- 
- #include <stdlib.h>
-+#include <stdio.h>
- #include <gbfwordjs.h>
- #include <swmodule.h>
- #include <ctype.h>
---- include/flatapi.h	2006-11-23 18:12:10.000000000 -0500
-+++ include/flatapi.h.new	2008-01-10 15:07:34.000000000 -0500
-@@ -24,6 +24,7 @@
- #define SWORDAPI_H
- 
- #include <defs.h>
-+#include <inttypes.h>
- #ifdef __cplusplus
- #endif
- 
---- utilities/diatheke/corediatheke.h	2003-04-04 23:13:23.000000000 -0500
-+++ utilities/diatheke/corediatheke.h.new	2008-01-10 15:49:18.000000000 -0500
-@@ -4,6 +4,7 @@
- // see accompanying LICENSE file for license details
- 
- #include <stdio.h>
-+#include <iostream>
- 
- #include "diathekemgr.h"
- #include <localemgr.h>
---- utilities/diatheke/corediatheke.cpp	2005-11-20 01:20:30.000000000 -0500
-+++ utilities/diatheke/corediatheke.cpp.new	2008-01-10 15:48:38.000000000 -0500
-@@ -6,7 +6,6 @@
- 
- #include "corediatheke.h"
- #include <regex.h>
--#include <iostream>
- #include <list>
- #include <utilstr.h>
- #include <versekey.h>
---- utilities/diatheke/diatheke.cpp	2005-05-16 14:10:25.000000000 -0400
-+++ utilities/diatheke/diatheke.cpp.new	2008-01-10 15:49:58.000000000 -0500
-@@ -8,7 +8,6 @@
- #include "corediatheke.h"
- #include "diathekemgr.h"
- #include "diafiltmgr.h"
--#include <iostream>
- #include <utilstr.h>
- 
- using std::cout;
---- utilities/diatheke/osiscgi.cpp	2006-11-25 10:20:51.000000000 -0500
-+++ utilities/diatheke/osiscgi.cpp.new	2008-01-10 21:07:05.000000000 -0500
-@@ -19,9 +19,7 @@
- #include <utilxml.h>
- #include <versekey.h>
- #include <swmodule.h>
--#ifdef WIN32
- #include <ctype.h>
--#endif
- 
- SWORD_NAMESPACE_START
- 
diff --git a/sword.spec b/sword.spec
index ee52522..7378e31 100644
--- a/sword.spec
+++ b/sword.spec
@@ -1,14 +1,12 @@
 Name:           sword           
-Version:        1.5.10
-Release:        3%{?dist}
+Version:        1.5.11
+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-gcc43.patch
-Patch1:		sword-diatheke.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  openssl-devel
 BuildRequires:  curl-devel
@@ -41,24 +39,21 @@ that uses the sword API, such as Gnomesword or Bibletime.
 
 %prep
 %setup -q
-%patch0 -p0 -b .gcc43
-%patch1 -p0 -b .diat
 
 %build
 %configure --disable-static --with-icu --with-lucene
-make 
-#%%{?_smp_mflags} sometimes causes build failure
+make %{?_smp_mflags}
 
 
 %install
-rm -rf %buildroot
-make install DESTDIR=%buildroot
-%__mkdir_p %buildroot%_datadir/sword/modules
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+mkdir -p %{_datadir}/sword/modules
 
-find %buildroot%_libdir -type f -name "*.la" -exec rm -f {} ';'
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
 %clean
-rm -rf %buildroot
+rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -70,21 +65,23 @@ rm -rf %buildroot
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README
 %doc samples doc
-%config(noreplace) %_sysconfdir/sword.conf
-%_bindir/*
-%_libdir/sword/
-%_libdir/libsword-%{version}.so
-%_datadir/sword
+%config(noreplace) %{_sysconfdir}/sword.conf
+%{_bindir}/*
+%{_libdir}/sword/
+%{_libdir}/libsword-%{version}.so
+%{_datadir}/sword
 
 %files devel
 %defattr(-,root,root,-)
 %doc CODINGSTYLE
-%_includedir/sword
-%_libdir/pkgconfig/sword.pc
-%_libdir/libsword.so
-
+%{_includedir}/sword
+%{_libdir}/pkgconfig/sword.pc
+%{_libdir}/libsword.so
 
 %changelog
+* Mon May 26 2008 Deji Akingunola <dakingun@gmail.com> - 1.5.11-1
+- Update to version 1.5.11
+
 * Thu Feb 21 2008 Deji Akingunola <dakingun@gmail.com> - 1.5.10-3
 - Fix command injection bug (Bug #433723)