[sword] rebuild for icu
Caolan McNamara
caolanm at fedoraproject.org
Fri Sep 9 13:05:10 UTC 2011
commit 68c7da1fc63ae0ea2b0374d5375bcd8ffe0b4bbd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 9 14:04:44 2011 +0100
rebuild for icu
sword-no-curl-types.patch | 22 ++++++++++++++++++++++
sword.spec | 3 +++
2 files changed, 25 insertions(+), 0 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 c895c58..918417f 100644
--- a/sword.spec
+++ b/sword.spec
@@ -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
More information about the scm-commits
mailing list