- Added patch to workaround bug in curl 7.20. Should be included upstream in 1.6...

Changed files:
    sword-curl.patch -> 1.1
    sword.spec -> 1.3

diff --git a/sword-curl.patch b/sword-curl.patch
new file mode 100644 (file)
index 0000000..ea55bc1
--- /dev/null
+++ b/sword-curl.patch
@@ -0,0 +1,12 @@
+--- src/mgr/curlftpt.cpp.orig  2009-12-04 10:54:06.000000000 +0200
++++ src/mgr/curlftpt.cpp       2010-05-21 14:35:10.525898704 +0300
+@@ -174,6 +174,9 @@
+               SWLog::getSystemLog()->logDebug("***** About to perform curl easy action. \n");
+               SWLog::getSystemLog()->logDebug("***** destPath: %s \n", destPath);
+               SWLog::getSystemLog()->logDebug("***** sourceURL: %s \n", sourceURL);
++
++              curl_easy_setopt(session, CURLOPT_PROGRESSDATA, (void*)NULL); 
++
+               res = curl_easy_perform(session);
+               SWLog::getSystemLog()->logDebug("***** Finished performing curl easy action. \n");
+ 

diff --git a/sword.spec b/sword.spec
index ae9ca029ddfcc592c6dec66a7d6e026e70f7520d..7a9baa1c0de0198fbc4ec767e3827c661c0e4d16 100644 (file)
--- a/sword.spec
+++ b/sword.spec
@@ -17,11 +17,12 @@
 Summary:       The SWORD Project framework for manipulating Bible texts
 Name:          sword
 Version:       1.6.1
-Release:       2
+Release:       3
 License:       GPL
 Group:         Libraries
 Source0:       http://www.crosswire.org/ftpmirror/pub/sword/source/v1.6/%{name}-%{version}.tar.gz
 # Source0-md5: 347e72f73313ff3ba700368db76a5d50
+Patch0:                %{name}-curl.patch
 URL:           http://www.crosswire.org/sword
 %{?with_clucene:BuildRequires: clucene-core-devel}
 %{?with_clucene:Requires:      clucene-core}
@@ -64,6 +65,9 @@ This package is required to compile Sword frontends, too.
 
 %prep
 %setup -q
+%if %{with_curl}
+%patch0 -p0
+%endif
 
 %build
 %{configure} \