From c2fc666d06f8c3796670988198d114abcb08cb06 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Fri, 1 Jul 2022 17:18:34 -0600
Subject: [PATCH] Update to 3.20.10

---
 .gitignore           |  1 +
 libdap-offline.patch | 22 ++++++++++++----------
 libdap.spec          |  7 +++++--
 sources              |  2 +-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index ab6bb7f..f3e09aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ libdap-3.10.2.tar.gz
 /libdap-3.20.6.tar.gz
 /libdap-3.20.8.tar.gz
 /libdap-3.20.9.tar.gz
+/libdap-3.20.10.tar.gz
diff --git a/libdap-offline.patch b/libdap-offline.patch
index 1bdadaa..2ecf385 100644
--- a/libdap-offline.patch
+++ b/libdap-offline.patch
@@ -1,7 +1,8 @@
-diff -up libdap-3.20.3/tests/Makefile.am.orig libdap-3.20.3/tests/Makefile.am
---- libdap-3.20.3/tests/Makefile.am.orig	2019-02-14 10:13:49.000000000 -0700
-+++ libdap-3.20.3/tests/Makefile.am	2019-02-17 15:27:32.426858748 -0700
-@@ -120,7 +120,6 @@ $(EXPRTESTSUITE) $(DMRTESTSUITE) $(GETDA
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index d325e52..123e73d 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -122,7 +122,6 @@ $(EXPRTESTSUITE) $(DMRTESTSUITE) $(GETDAPTESTSUITE)
  	$(SHELL) '$(DDSTESTSUITE)' $(TESTSUITEFLAGS)
  	$(SHELL) '$(EXPRTESTSUITE)' $(TESTSUITEFLAGS)
  	$(SHELL) '$(DMRTESTSUITE)' $(TESTSUITEFLAGS)
@@ -9,18 +10,19 @@ diff -up libdap-3.20.3/tests/Makefile.am.orig libdap-3.20.3/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.20.3/unit-tests/Makefile.am.orig libdap-3.20.3/unit-tests/Makefile.am
---- libdap-3.20.3/unit-tests/Makefile.am.orig	2019-02-17 15:27:32.426858748 -0700
-+++ libdap-3.20.3/unit-tests/Makefile.am	2019-02-17 15:28:10.725606175 -0700
-@@ -78,9 +78,9 @@ D4-xml.tar.gz: D4-xml/DMR_*[0-9].xml
+diff --git a/unit-tests/Makefile.am b/unit-tests/Makefile.am
+index 58ecd20..abbf860 100644
+--- a/unit-tests/Makefile.am
++++ b/unit-tests/Makefile.am
+@@ -85,9 +85,9 @@ D4-xml.tar.gz: D4-xml/DMR_*[0-9].xml
  if CPPUNIT
  UNIT_TESTS = marshT arrayT attrTableT structT sequenceT ddsT dasT \
- 	RegexTest ArrayTest AttrTableTest ByteTest MIMEUtilTest ancT DASTest \
+ 	RegexTest ArrayTest GridTest AttrTableTest ByteTest MIMEUtilTest ancT DASTest \
 -	DDSTest	DDXParserTest  generalUtilTest HTTPConnectTest parserUtilTest \
 +	DDSTest	DDXParserTest  generalUtilTest parserUtilTest \
  	RCReaderTest SequenceTest SignalHandlerTest  MarshallerTest \
 -	HTTPCacheTest ServerFunctionsListUnitTest Int8Test Int16Test UInt16Test \
 +	ServerFunctionsListUnitTest Int8Test Int16Test UInt16Test \
  	Int32Test UInt32Test Int64Test UInt64Test Float32Test Float64Test \
- 	D4BaseTypeFactoryTest BaseTypeFactoryTest
+ 	D4BaseTypeFactoryTest BaseTypeFactoryTest util_mitTest
  
diff --git a/libdap.spec b/libdap.spec
index 69d8648..c26e4ae 100644
--- a/libdap.spec
+++ b/libdap.spec
@@ -1,7 +1,7 @@
 Name: libdap
 Summary: The C++ DAP2 library from OPeNDAP
-Version: 3.20.9
-Release: 2%{?dist}
+Version: 3.20.10
+Release: 1%{?dist}
 
 License: LGPLv2+
 URL: http://www.opendap.org/
@@ -129,6 +129,9 @@ make check || :
 
 
 %changelog
+* Fri Jul 01 2022 Orion Poplawski <orion@nwra.com> - 3.20.10-1
+- Update to 3.20.10
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index 1f3ce07..224bfc2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libdap-3.20.9.tar.gz) = 2e360148e5ca3b5c12552ff429b161d8be6905594ae2df98c5b005cd286cb803913b8336371cd07361082749122f7aa5cbc93ff1812ed598908afd0e83df927c
+SHA512 (libdap-3.20.10.tar.gz) = a3e58550eb4153a3c9c11fcfba56d87e56273ada6c25c78f7bf04d38f533dd873d124ef52e5c8fa4b648c0bb08ad7295f06c3d23fa09abeea0b169bd03f95117