[raptor] - upstream patch to fix build against newer libcurl
Rex Dieter
rdieter at fedoraproject.org
Sun Jul 31 16:01:15 UTC 2011
commit 475981565331c25f3b0b65c1d7f6f345ca6c84b6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Sun Jul 31 11:06:39 2011 -0500
- upstream patch to fix build against newer libcurl
raptor-1.4.21-curl.patch | 11 +++++++++++
raptor.spec | 5 +++++
2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/raptor-1.4.21-curl.patch b/raptor-1.4.21-curl.patch
new file mode 100644
index 0000000..5901405
--- /dev/null
+++ b/raptor-1.4.21-curl.patch
@@ -0,0 +1,11 @@
+diff -up raptor-1.4.21/src/raptor_internal.h.curl raptor-1.4.21/src/raptor_internal.h
+--- raptor-1.4.21/src/raptor_internal.h.curl 2010-01-29 17:54:42.000000000 -0600
++++ raptor-1.4.21/src/raptor_internal.h 2011-07-31 11:02:44.182465296 -0500
+@@ -852,7 +852,6 @@ int raptor_utf8_is_nfc(const unsigned ch
+
+ #ifdef RAPTOR_WWW_LIBCURL
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #endif
+
diff --git a/raptor.spec b/raptor.spec
index f0cc1dd..45674c8 100644
--- a/raptor.spec
+++ b/raptor.spec
@@ -17,6 +17,9 @@ URL: http://librdf.org/raptor/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libxml2-devel libxslt-devel curl-devel
+## upstream patches
+Patch100: raptor-1.4.21-curl.patch
+
%description
Raptor is the RDF Parser Toolkit for Redland that provides
a set of standalone RDF parsers, generating triples from RDF/XML
@@ -36,6 +39,7 @@ RDF/XML or N-Triples.
%prep
%setup -q
%patch0 -p1 -b .multilib
+%patch100 -p1 -b .curl
# Fix encoding
iconv -f ISO-8859-1 -t UTF8 NEWS > NEWS.tmp
@@ -95,6 +99,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sun Jul 31 2011 Rex Dieter <rdieter at fedoraproject.org> 1.4.21-3
- omit rapper, include in raptor2 instead (f16+)
+- upstream patch to fix build against newer libcurl
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.21-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list