From 9beb43794ee27521adc92a59edda7f704ed2d59b Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@fedoraproject.org>
Date: Tue, 13 Jul 2010 22:24:13 +0000
Subject: [PATCH] - Update to 3.10.2 - Drop includes patch fixed upstream - Add
 license to doc sub-package

---
 libdap-3.8.2-includes.patch | 19 -------------------
 libdap.spec                 | 27 ++++++++++++++++-----------
 2 files changed, 16 insertions(+), 30 deletions(-)
 delete mode 100644 libdap-3.8.2-includes.patch

diff --git a/libdap-3.8.2-includes.patch b/libdap-3.8.2-includes.patch
deleted file mode 100644
index effbd49..0000000
--- a/libdap-3.8.2-includes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ru libdap-3.8.2.orig/util_mit.cc libdap-3.8.2/util_mit.cc
---- libdap-3.8.2.orig/util_mit.cc	2009-03-03 15:12:12.000000000 +0000
-+++ libdap-3.8.2/util_mit.cc	2009-03-03 15:12:52.000000000 +0000
-@@ -35,6 +35,7 @@
- 
- #include <cstring>
- #include <cstdlib>
-+#include <cstdio>
- #include <string>
- #include <ctype.h>
- 
-@@ -54,6 +55,7 @@
- using std::cerr;
- using std::endl;
- using std::string;
-+using std::sprintf;
- 
- #include "debug.h"
- 
diff --git a/libdap.spec b/libdap.spec
index 9608f8b..46db7c3 100644
--- a/libdap.spec
+++ b/libdap.spec
@@ -1,22 +1,21 @@
 Name: libdap
 Summary: The C++ DAP2 library from OPeNDAP
-Version: 3.9.3
-Release: 2%{?dist}
+Version: 3.10.2
+Release: 1%{?dist}
 
 # the deflate program is covered by the W3C license
 License: LGPLv2+ and W3C
 Group: Development/Libraries
 URL: http://www.opendap.org/
 Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz
-Patch0: libdap-3.8.2-includes.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Mandrake
-# BuildRequires: libcurl3-devel >= 7.10.6 libxml2-devel >= 2.5.7
-# fedora
-BuildRequires: curl-devel >= 7.10.6 libxml2-devel >= 2.5.7
-BuildRequires: doxygen graphviz
+BuildRequires: curl-devel
+BuildRequires: libxml2-devel
+BuildRequires: doxygen
+BuildRequires: graphviz
+BuildRequires: libuuid-devel
 # deflate depends directly on zlib
 BuildRequires: zlib-devel
 BuildRequires: pkgconfig
@@ -39,7 +38,8 @@ the library when it returns compressed responses.
 Summary: Development and header files from libdap
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: curl-devel >= 7.10.6 libxml2-devel >= 2.5.7
+Requires: curl-devel
+Requires: libxml2-devel
 Requires: pkgconfig
 # for the /usr/share/aclocal directory ownership
 Requires: automake
@@ -59,7 +59,6 @@ Documentation of the libdap library.
 
 %prep
 %setup -q
-%patch0 -p1 -b .includes
 iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
 touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
 mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
@@ -103,7 +102,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libdap.so.*
 %{_libdir}/libdapclient.so.*
 %{_libdir}/libdapserver.so.*
-%doc README NEWS COPYING COPYRIGHT_URI README.AIS README.dodsrc
+%doc README NEWS COPYING COPYRIGHT_URI README.dodsrc
 %doc COPYRIGHT_W3C
 
 %files devel
@@ -118,10 +117,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files doc
 %defattr(-,root,root,-)
+%doc COPYING COPYRIGHT_URI COPYRIGHT_W3C
 %doc __dist_docs/html/
 
 
 %changelog
+* Tue Jul 13 2010 Orion Poplawski <orion@cora.nwra.com> - 3.10.2-1
+- Update to 3.10.2
+- Drop includes patch fixed upstream
+- Add license to doc sub-package
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.9.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild