From 2920d46f391a11c51dfca42a8e578f41ad3373eb Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Sat, 14 Jan 2012 08:50:57 -0700
Subject: [PATCH] Add patch to compile with gcc 4.7

---
 libdap-gcc47.patch | 11 +++++++++++
 libdap.spec        |  8 +++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 libdap-gcc47.patch

diff --git a/libdap-gcc47.patch b/libdap-gcc47.patch
new file mode 100644
index 0000000..7591342
--- /dev/null
+++ b/libdap-gcc47.patch
@@ -0,0 +1,11 @@
+diff -up libdap-3.11.1/ResponseBuilder.cc.gcc47 libdap-3.11.1/ResponseBuilder.cc
+--- libdap-3.11.1/ResponseBuilder.cc.gcc47	2011-04-29 07:19:43.000000000 -0600
++++ libdap-3.11.1/ResponseBuilder.cc	2012-01-14 08:50:16.434627257 -0700
+@@ -27,6 +27,7 @@
+ static char rcsid[] not_used = { "$Id: ResponseBuilder.cc 23477 2010-09-02 21:02:59Z jimg $" };
+ 
+ #include <signal.h>
++#include <unistd.h>
+ 
+ #ifndef WIN32
+ // #include <unistd.h>   // for getopt
diff --git a/libdap.spec b/libdap.spec
index d007948..73e4d0b 100644
--- a/libdap.spec
+++ b/libdap.spec
@@ -1,7 +1,7 @@
 Name: libdap
 Summary: The C++ DAP2 library from OPeNDAP
 Version: 3.11.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: LGPLv2+
 Group: Development/Libraries
@@ -13,6 +13,8 @@ Patch0:  libdap-3.10.2-offline.patch
 Patch1:  libdap-curl.patch
 # Upsteam patch to test output to fix failing test
 Patch2:  libdap-test.patch
+# Compile with gcc 4.7
+Patch3:  libdap-gcc47.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -65,6 +67,7 @@ Documentation of the libdap library.
 %patch0 -p1 -b .offline
 %patch1 -p1 -b .curl
 %patch2 -p1 -b .test
+%patch3 -p1 -b .gcc47
 iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
 touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
 mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
@@ -130,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jan 14 2012 Orion Poplawski <orion@cora.nwra.com> - 3.11.1-4
+- Add patch to compile with gcc 4.7
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.11.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild