From 124c8b88098513a52e03da5dbd0a7067d5acdb11 Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Sat, 20 Mar 2010 17:08:29 +0000 Subject: [PATCH] - Work around regression in curl-7.20.0 (Patch by Karl Kleinpaste), fix #569685 --- sword-curl-7.20.0-fix.patch | 10 ++++++++++ sword.spec | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 sword-curl-7.20.0-fix.patch diff --git a/sword-curl-7.20.0-fix.patch b/sword-curl-7.20.0-fix.patch new file mode 100644 index 0000000..c3b7ddc --- /dev/null +++ b/sword-curl-7.20.0-fix.patch @@ -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); + } + diff --git a/sword.spec b/sword.spec index 26a412f..a92172d 100644 --- a/sword.spec +++ b/sword.spec @@ -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 - 1.6.1-2 +- Work around regression in curl-7.20.0 (Patch by Karl Kleinpaste), fix #569685 + * Wed Jan 13 2010 Deji Akingunola - 1.6.1-1 - Update to version 1.6.1