packages: sword/sword.spec, sword/sword-curl.patch (NEW) - Added patch to w...
caleb
caleb at pld-linux.org
Fri May 21 13:46:49 CEST 2010
Author: caleb Date: Fri May 21 11:46:49 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- Added patch to workaround bug in curl 7.20. Should be included upstream in 1.6.2 when it comes out.
---- Files affected:
packages/sword:
sword.spec (1.2 -> 1.3) , sword-curl.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/sword/sword.spec
diff -u packages/sword/sword.spec:1.2 packages/sword/sword.spec:1.3
--- packages/sword/sword.spec:1.2 Fri May 21 10:25:20 2010
+++ packages/sword/sword.spec Fri May 21 13:46:44 2010
@@ -18,11 +18,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}
@@ -65,6 +66,9 @@
%prep
%setup -q
+%if %{with_curl}
+%patch0 -p0
+%endif
%build
%{configure} \
@@ -130,6 +134,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.3 2010/05/21 11:46:44 caleb
+- Added patch to workaround bug in curl 7.20. Should be included upstream in 1.6.2 when it comes out.
+
Revision 1.2 2010/05/21 08:25:20 caleb
- Subpackaged utilities
- Added bconds for curl, clucene, icu
================================================================
Index: packages/sword/sword-curl.patch
diff -u /dev/null packages/sword/sword-curl.patch:1.1
--- /dev/null Fri May 21 13:46:49 2010
+++ packages/sword/sword-curl.patch Fri May 21 13:46:44 2010
@@ -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");
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sword/sword.spec?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list