From 90875a3a308160a3c6a722470679cdfc0842e1ea Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Fri, 12 Aug 2016 10:01:58 -0600
Subject: [PATCH] Update to 3.18.1

---
 .gitignore           |  1 +
 libdap-offline.patch | 16 ++++++++--------
 libdap.spec          | 17 ++++++++++-------
 sources              |  2 +-
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8f67cc5..01ae20c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ libdap-3.10.2.tar.gz
 /libdap-3.17.0.tar.gz
 /version-3.17.1.tar.gz
 /libdap-3.17.2.tar.gz
+/libdap-3.18.1.tar.gz
diff --git a/libdap-offline.patch b/libdap-offline.patch
index 30f45d3..a8c5ab5 100644
--- a/libdap-offline.patch
+++ b/libdap-offline.patch
@@ -1,6 +1,6 @@
-diff -up libdap-3.15.1/tests/Makefile.am.offline libdap-3.15.1/tests/Makefile.am
---- libdap-3.15.1/tests/Makefile.am.offline	2015-09-23 09:22:30.878380060 -0600
-+++ libdap-3.15.1/tests/Makefile.am	2015-09-23 09:24:10.341953855 -0600
+diff -up libdap-3.18.1/tests/Makefile.am.offline libdap-3.18.1/tests/Makefile.am
+--- libdap-3.18.1/tests/Makefile.am.offline	2015-10-19 16:03:35.000000000 -0600
++++ libdap-3.18.1/tests/Makefile.am	2016-08-12 09:33:37.767696856 -0600
 @@ -112,7 +112,6 @@ $(EXPRTESTSUITE) $(DMRTESTSUITE) $(GETDA
  	$(SHELL) '$(DDSTESTSUITE)' $(TESTSUITEFLAGS)
  	$(SHELL) '$(EXPRTESTSUITE)' $(TESTSUITEFLAGS)
@@ -9,9 +9,9 @@ diff -up libdap-3.15.1/tests/Makefile.am.offline libdap-3.15.1/tests/Makefile.am
  
  # Make sure there are no spaces after the DASTESTSUITE names. jhrg 3/16/15
  # Delete the scripts here and not using CLEANFILES because this target is
-diff -up libdap-3.15.1/unit-tests/Makefile.am.offline libdap-3.15.1/unit-tests/Makefile.am
---- libdap-3.15.1/unit-tests/Makefile.am.offline	2015-06-16 20:18:25.000000000 -0600
-+++ libdap-3.15.1/unit-tests/Makefile.am	2015-09-23 09:22:30.879380056 -0600
+diff -up libdap-3.18.1/unit-tests/Makefile.am.offline libdap-3.18.1/unit-tests/Makefile.am
+--- libdap-3.18.1/unit-tests/Makefile.am.offline	2016-08-12 09:33:37.768696852 -0600
++++ libdap-3.18.1/unit-tests/Makefile.am	2016-08-12 09:34:12.984547765 -0600
 @@ -67,9 +67,9 @@ D4-xml.tar.gz: D4-xml/DMR_*[0-9].xml
  if CPPUNIT
  UNIT_TESTS = marshT arrayT attrTableT structT sequenceT ddsT dasT \
@@ -19,8 +19,8 @@ diff -up libdap-3.15.1/unit-tests/Makefile.am.offline libdap-3.15.1/unit-tests/M
 -	DDSTest	DDXParserTest  generalUtilTest HTTPConnectTest parserUtilTest \
 +	DDSTest	DDXParserTest  generalUtilTest parserUtilTest \
  	RCReaderTest SequenceTest SignalHandlerTest  MarshallerTest \
--	HTTPCacheTest ServerFunctionsListUnitTest 
-+	ServerFunctionsListUnitTest 
+-	HTTPCacheTest ServerFunctionsListUnitTest
++	ServerFunctionsListUnitTest
  
  if DAP4_DEFINED
  UNIT_TESTS += D4MarshallerTest D4UnMarshallerTest D4DimensionsTest \
diff --git a/libdap.spec b/libdap.spec
index 13213f3..40e8a96 100644
--- a/libdap.spec
+++ b/libdap.spec
@@ -1,7 +1,7 @@
 Name: libdap
 Summary: The C++ DAP2 library from OPeNDAP
-Version: 3.17.2
-Release: 2%{?dist}
+Version: 3.18.1
+Release: 1%{?dist}
 
 License: LGPLv2+
 Group: Development/Libraries
@@ -12,7 +12,7 @@ Patch0:  libdap-offline.patch
 
 # For autoreconf
 BuildRequires: libtool
-BuildRequires: bison
+BuildRequires: bison >= 3.0
 BuildRequires: cppunit-devel
 BuildRequires: curl-devel
 BuildRequires: doxygen
@@ -104,15 +104,15 @@ make check
 
 
 %files
+%license COPYRIGHT_W3C COPYING COPYRIGHT_URI
+%doc README NEWS README.dodsrc
 %{_bindir}/getdap
 %{_bindir}/getdap4
-%{_libdir}/libdap.so.21*
+%{_libdir}/libdap.so.23*
 %{_libdir}/libdapclient.so.6*
 %{_libdir}/libdapserver.so.7*
 %{_mandir}/man1/getdap.1*
 %{_mandir}/man1/getdap4.1*
-%doc README NEWS COPYING COPYRIGHT_URI README.dodsrc
-%doc COPYRIGHT_W3C
 
 %files devel
 %{_libdir}/libdap.so
@@ -126,11 +126,14 @@ make check
 %{_mandir}/man1/dap-config.1*
 
 %files doc
-%doc COPYING COPYRIGHT_URI COPYRIGHT_W3C
+%license COPYING COPYRIGHT_URI COPYRIGHT_W3C
 %doc __dist_docs/html/
 
 
 %changelog
+* Fri Aug 12 2016 Orion Poplawski <orion@cora.nwra.com> - 3.18.1-1
+- Update to 3.18.1
+
 * Thu Aug 11 2016 Michal Toman <mtoman@fedoraproject.org> - 3.17.2-2
 - No valgrind on MIPS
 
diff --git a/sources b/sources
index 54ef4aa..b9a93cb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d8051a36df74a13d1bb912fe9704776f  libdap-3.17.2.tar.gz
+9bdca37f89dca3e1df2239ceb32f74a8  libdap-3.18.1.tar.gz