- Work around regression in curl-7.20.0 (Patch by Karl Kleinpaste), fix

#569685
This commit is contained in:
Deji Akingunola 2010-03-20 17:08:29 +00:00
parent 2c38283486
commit 124c8b8809
2 changed files with 16 additions and 1 deletions

View File

@ -0,0 +1,10 @@
--- src/mgr/curlftpt.cpp 2009-12-04 03:54:06.000000000 -0500
+++ src/mgr/curlftpt.cpp.new 2010-03-20 12:41:50.449544991 -0400
@@ -124,6 +124,7 @@
CURLFTPTransport::~CURLFTPTransport() {
+ curl_easy_setopt(session, CURLOPT_PROGRESSDATA, (void*)NULL);
curl_easy_cleanup(session);
}

View File

@ -1,12 +1,13 @@
Name: sword
Version: 1.6.1
Release: 1%{?dist}
Release: 2%{?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.6/sword-%{version}.tar.gz
Patch0: sword-curl-7.20.0-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel
BuildRequires: curl-devel
@ -40,6 +41,7 @@ that uses the sword API, such as Gnomesword or Bibletime.
%prep
%setup -q
%patch0 -p0 -b .fix
%build
%configure --disable-static --with-icu
@ -82,6 +84,9 @@ rm -rf %{buildroot}
%{_libdir}/libsword.so
%changelog
* Sat Mar 20 2010 Deji Akingunola <dakingun@gmail.com> - 1.6.1-2
- Work around regression in curl-7.20.0 (Patch by Karl Kleinpaste), fix #569685
* Wed Jan 13 2010 Deji Akingunola <dakingun@gmail.com> - 1.6.1-1
- Update to version 1.6.1