Compare commits

...

1 Commits
master ... f15

Author SHA1 Message Date
Orion Poplawski faa5721565 Add patch for current libcurl 2011-11-29 13:35:06 -07:00
2 changed files with 20 additions and 3 deletions

11
libdap-curl.patch Normal file
View File

@ -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_

View File

@ -1,14 +1,16 @@
Name: libdap
Summary: The C++ DAP2 library from OPeNDAP
Version: 3.11.0
Release: 2%{?dist}
Release: 3%{?dist}
License: LGPLv2+
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
@ -124,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Nov 28 2011 Orion Poplawski <orion@cora.nwra.com> - 3.11.0-3
- 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