rebuild for icu

This commit is contained in:
Caolán McNamara 2011-09-09 14:04:44 +01:00
parent 2ff9b1befa
commit 68c7da1fc6
2 changed files with 25 additions and 0 deletions

22
sword-no-curl-types.patch Normal file
View File

@ -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>

View File

@ -16,6 +16,8 @@ BuildRequires: libicu-devel icu
BuildRequires: clucene-core-devel BuildRequires: clucene-core-devel
BuildRequires: cppunit-devel BuildRequires: cppunit-devel
Patch0: sword-no-curl-types.patch
%description %description
The SWORD Project is the CrossWire Bible Society's free Bible software The SWORD Project is the CrossWire Bible Society's free Bible software
project. Its purpose is to create cross-platform open-source tools-- 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 %prep
%setup -q %setup -q
%patch0 -p1 -b .no-curl-types
%build %build
%configure --disable-static --with-icu --with-lucene %configure --disable-static --with-icu --with-lucene