diff --git a/raptor2-2.0.3-curl.patch b/raptor2-2.0.3-curl.patch new file mode 100644 index 0000000..d536968 --- /dev/null +++ b/raptor2-2.0.3-curl.patch @@ -0,0 +1,11 @@ +diff -up raptor2-2.0.3/src/raptor_internal.h.curl raptor2-2.0.3/src/raptor_internal.h +--- raptor2-2.0.3/src/raptor_internal.h.curl 2011-01-27 11:47:46.000000000 -0600 ++++ raptor2-2.0.3/src/raptor_internal.h 2011-07-29 16:55:56.328813566 -0500 +@@ -920,7 +920,6 @@ int raptor_unicode_check_utf8_nfc_string + + #ifdef RAPTOR_WWW_LIBCURL + #include +-#include + #include + #endif + diff --git a/raptor2.spec b/raptor2.spec index b6809dc..e35fac4 100644 --- a/raptor2.spec +++ b/raptor2.spec @@ -2,7 +2,7 @@ Summary: RDF Parser Toolkit for Redland Name: raptor2 Version: 2.0.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ or LGPLv2+ or ASL 2.0 Source: http://download.librdf.org/source/raptor2-%{version}.tar.gz @@ -12,6 +12,10 @@ URL: http://librdf.org/raptor/ # make docs not conflict with raptor(1), DOC_MODULE=raptor2 Patch50: raptor2-2.0.3-raptor2_doc.patch +## upstream patches +# https://github.com/dajobe/raptor/commit/820ea624587f045de732b7e0d6dda1499e0f61ff#src/raptor_internal.h +Patch100: raptor2-2.0.3-curl.patch + BuildRequires: curl-devel BuildRequires: gtk-doc BuildRequires: libxslt-devel @@ -36,6 +40,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %setup -q %patch50 -p1 -b .raptor2_doc +%patch100 -p1 -b .curl # hack to nuke rpaths %if "%{_libdir}" != "/usr/lib" @@ -91,6 +96,9 @@ rm -rf %{buildroot} %changelog +* Fri Jul 29 2011 Rex Dieter 2.0.3-3 +- upstream patch to fix build against newer libcurl + * Tue Jul 26 2011 Rex Dieter 2.0.3-2 - -devel: drop Group: tag - add lot's of %%doc's