[sword/f16] Rebuild for clucene-2.3.3.4 Apply patch to build newer curl (Caolán McNamara)

[Deji Akingunola]

commit b96db9be53c125e92be9dba9390a05c5e8d23f16
Author: Deji Akingunola <dakingun at mail.com>
Date:   Tue Sep 13 11:15:42 2011 -0400

    Rebuild for clucene-2.3.3.4
    Apply patch to build newer curl (Caolán McNamara)

 sword-no-curl-types.patch |   22 ++++++++++++++++++++++
 sword.spec                |    9 ++++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/sword-no-curl-types.patch b/sword-no-curl-types.patch
new file mode 100644
index 0000000..6cdb6b1
--- /dev/null
+++ b/sword-no-curl-types.patch
@@ -0,0 +1,22 @@
+diff -ru sword-1.6.2/src/mgr/curlftpt.cpp sword-1.6.2/src/mgr/curlftpt.cpp
+--- sword-1.6.2/src/mgr/curlftpt.cpp	2011-09-09 11:49:31.069556262 +0100
++++ sword-1.6.2/src/mgr/curlftpt.cpp	2011-09-09 11:49:48.127734191 +0100
+@@ -26,7 +26,6 @@
+ #include <fcntl.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <swlog.h>
+diff -ru sword-1.6.2/src/mgr/curlhttpt.cpp sword-1.6.2/src/mgr/curlhttpt.cpp
+--- sword-1.6.2/src/mgr/curlhttpt.cpp	2011-09-09 11:49:31.069556262 +0100
++++ sword-1.6.2/src/mgr/curlhttpt.cpp	2011-09-09 11:49:46.399716165 +0100
+@@ -25,7 +25,6 @@
+ #include <cctype>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <swlog.h>
diff --git a/sword.spec b/sword.spec
index b0cdf9e..3027657 100644
--- a/sword.spec
+++ b/sword.spec
@@ -1,6 +1,6 @@
 Name:           sword           
 Version:        1.6.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Free Bible Software Project
 
 Group:          System Environment/Libraries
@@ -16,6 +16,8 @@ BuildRequires:  libicu-devel icu
 BuildRequires:  clucene-core-devel
 BuildRequires:  cppunit-devel
 
+Patch0:         sword-no-curl-types.patch
+
 %description
 The SWORD Project is the CrossWire Bible Society's free Bible software
 project. Its purpose is to create cross-platform open-source tools--
@@ -40,6 +42,7 @@ that uses the sword API, such as Gnomesword or Bibletime.
 
 %prep
 %setup -q
+%patch0 -p1 -b .no-curl-types
 
 %build
 %configure --disable-static --with-icu --with-lucene
@@ -82,6 +85,10 @@ rm -rf %{buildroot}
 %{_libdir}/libsword.so
 
 %changelog
+* Tue Sep 13 2011 Deji Akingunola <dakingun at gmail.com> - 1.6.2-4
+- Rebuild for clucene-2.3.3.4
+- Apply patch to build newer curl (Caolán McNamara)
+
 * Mon Mar 07 2011 Caolán McNamara <caolanm at redhat.com> - 1.6.2-3
 - rebuild for icu 4.6