From 31ddda46a407c81477b50f0a316e09647369613c Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Tue, 22 Nov 2011 13:14:21 -0700
Subject: [PATCH] Add patch for current libcurl

---
 libdap-curl.patch | 11 +++++++++++
 libdap.spec       |  8 ++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 libdap-curl.patch

diff --git a/libdap-curl.patch b/libdap-curl.patch
new file mode 100644
index 0000000..cf84ef1
--- /dev/null
+++ b/libdap-curl.patch
@@ -0,0 +1,11 @@
+diff -up libdap-3.11.1/HTTPConnect.h.curl libdap-3.11.1/HTTPConnect.h
+--- libdap-3.11.1/HTTPConnect.h.curl	2011-04-29 07:19:43.000000000 -0600
++++ libdap-3.11.1/HTTPConnect.h	2011-11-22 13:11:58.059715070 -0700
+@@ -30,7 +30,6 @@
+ #include <string>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #ifndef _rc_reader_h_
diff --git a/libdap.spec b/libdap.spec
index f4501e4..94f6619 100644
--- a/libdap.spec
+++ b/libdap.spec
@@ -8,7 +8,9 @@ Group: Development/Libraries
 URL: http://www.opendap.org/
 Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz
 #Don't run HTTP tests - builders don't have network connections
-Patch2:  libdap-3.10.2-offline.patch
+Patch0:  libdap-3.10.2-offline.patch
+# Patch for recent libcurl
+Patch1:  libdap-curl.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -58,7 +60,8 @@ Documentation of the libdap library.
 
 %prep
 %setup -q
-%patch2 -p1 -b .offline
+%patch0 -p1 -b .offline
+%patch1 -p1 -b .curl
 iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
 touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
 mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
@@ -126,6 +129,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Tue Nov 22 2011 Orion Poplawski <orion@cora.nwra.com> - 3.11.1-1
 - Update to 3.11.1
+- Add patch for current libcurl
 
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.11.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild