.gitignore

@@ -12,5 +12,3 @@ libdap-3.10.2.tar.gz
 /version-3.17.1.tar.gz
 /libdap-3.17.2.tar.gz
 /libdap-3.18.1.tar.gz
-/libdap-3.18.2.tar.gz
-/libdap-3.18.3.tar.gz

libdap-big-endian-baselines.patch

@@ -0,0 +1,173 @@
+commit fb5ea7a3554d0cbd0e287b27b9c0b5c06b5c0388
+Author: Dan Horák <dan@danny.cz>
+Date:   Fri Aug 26 14:59:09 2016 +0200
+
+    add missing big endian baselines
+
+diff --git a/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.1.trans_base b/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.1.trans_base
+new file mode 100644
+index 0000000..fddf8f8
+--- /dev/null
++++ b/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.1.trans_base
+@@ -0,0 +1,33 @@
++Parse successful
++<?xml version="1.0" encoding="ISO-8859-1"?>
++<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_3">
++    <Dimension name="row" size="5"/>
++    <Float32 name="row">
++        <Dim name="/row"/>
++    </Float32>
++    <String name="x">
++        <Dim name="/row"/>
++        <Map name="/row"/>
++    </String>
++</Dataset>
++
++<?xml version="1.0" encoding="ISO-8859-1"?>
++<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_3">
++    <Dimension name="row" size="5"/>
++    <Float32 name="row">
++        <Dim name="/row"/>
++        <Attribute name="DAP4_Checksum_CRC32" type="String">
++            <Value>d5c902a7</Value>
++        </Attribute>
++    </Float32>
++    <String name="x">
++        <Dim name="/row"/>
++        <Attribute name="DAP4_Checksum_CRC32" type="String">
++            <Value>d2207316</Value>
++        </Attribute>
++        <Map name="/row"/>
++    </String>
++</Dataset>
++
++The data:
++{ {99.999, 99.999, 99.999, 99.999, 99.999}, {"Silly test string: 1", "Silly test string: 1", "Silly test string: 1", "Silly test string: 1", "Silly test string: 1"} }
+diff --git a/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.2.trans_base b/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.2.trans_base
+new file mode 100644
+index 0000000..90e228f
+--- /dev/null
++++ b/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.2.trans_base
+@@ -0,0 +1,27 @@
++Parse successful
++<?xml version="1.0" encoding="ISO-8859-1"?>
++<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_3">
++    <Dimension name="row" size="5"/>
++    <Float32 name="row">
++        <Dim name="/row"/>
++    </Float32>
++    <String name="x">
++        <Dim name="/row"/>
++        <Map name="/row"/>
++    </String>
++</Dataset>
++
++<?xml version="1.0" encoding="ISO-8859-1"?>
++<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_3">
++    <Dimension name="row" size="2"/>
++    <String name="x">
++        <Dim name="/row"/>
++        <Attribute name="DAP4_Checksum_CRC32" type="String">
++            <Value>55708e52</Value>
++        </Attribute>
++        <Map name="/row"/>
++    </String>
++</Dataset>
++
++The data:
++{ {"Silly test string: 1", "Silly test string: 1"} }
+diff --git a/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.3.trans_base b/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.3.trans_base
+new file mode 100644
+index 0000000..80ade42
+--- /dev/null
++++ b/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.3.trans_base
+@@ -0,0 +1,25 @@
++Parse successful
++<?xml version="1.0" encoding="ISO-8859-1"?>
++<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_3">
++    <Dimension name="row" size="5"/>
++    <Float32 name="row">
++        <Dim name="/row"/>
++    </Float32>
++    <String name="x">
++        <Dim name="/row"/>
++        <Map name="/row"/>
++    </String>
++</Dataset>
++
++<?xml version="1.0" encoding="ISO-8859-1"?>
++<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_3">
++    <String name="x">
++        <Dim size="2"/>
++        <Attribute name="DAP4_Checksum_CRC32" type="String">
++            <Value>55708e52</Value>
++        </Attribute>
++    </String>
++</Dataset>
++
++The data:
++{ {"Silly test string: 1", "Silly test string: 1"} }
+diff --git a/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.4.trans_base b/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.4.trans_base
+new file mode 100644
+index 0000000..80ade42
+--- /dev/null
++++ b/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.4.trans_base
+@@ -0,0 +1,25 @@
++Parse successful
++<?xml version="1.0" encoding="ISO-8859-1"?>
++<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_3">
++    <Dimension name="row" size="5"/>
++    <Float32 name="row">
++        <Dim name="/row"/>
++    </Float32>
++    <String name="x">
++        <Dim name="/row"/>
++        <Map name="/row"/>
++    </String>
++</Dataset>
++
++<?xml version="1.0" encoding="ISO-8859-1"?>
++<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_3">
++    <String name="x">
++        <Dim size="2"/>
++        <Attribute name="DAP4_Checksum_CRC32" type="String">
++            <Value>55708e52</Value>
++        </Attribute>
++    </String>
++</Dataset>
++
++The data:
++{ {"Silly test string: 1", "Silly test string: 1"} }
+diff --git a/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.5.trans_base b/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.5.trans_base
+new file mode 100644
+index 0000000..8943261
+--- /dev/null
++++ b/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.5.trans_base
+@@ -0,0 +1,27 @@
++Parse successful
++<?xml version="1.0" encoding="ISO-8859-1"?>
++<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_3">
++    <Dimension name="row" size="5"/>
++    <Float32 name="row">
++        <Dim name="/row"/>
++    </Float32>
++    <String name="x">
++        <Dim name="/row"/>
++        <Map name="/row"/>
++    </String>
++</Dataset>
++
++<?xml version="1.0" encoding="ISO-8859-1"?>
++<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_3">
++    <Dimension name="row" size="5"/>
++    <String name="x">
++        <Dim name="/row"/>
++        <Attribute name="DAP4_Checksum_CRC32" type="String">
++            <Value>d2207316</Value>
++        </Attribute>
++        <Map name="/row"/>
++    </String>
++</Dataset>
++
++The data:
++{ {"Silly test string: 1", "Silly test string: 1", "Silly test string: 1", "Silly test string: 1", "Silly test string: 1"} }

libdap-getopt.patch

@@ -0,0 +1,12 @@
+diff -up libdap-3.18.1/unit-tests/D4FilterClauseTest.cc.getopt libdap-3.18.1/unit-tests/D4FilterClauseTest.cc
+--- libdap-3.18.1/unit-tests/D4FilterClauseTest.cc.getopt	2016-05-05 17:43:15.000000000 -0600
++++ libdap-3.18.1/unit-tests/D4FilterClauseTest.cc	2016-08-12 14:00:24.398185600 -0600
+@@ -566,7 +566,7 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
++    int option_char;
+ 
+     while ((option_char = getopt()) != EOF)
+         switch (option_char) {

libdap.spec

@@ -1,7 +1,7 @@
 Name: libdap
 Summary: The C++ DAP2 library from OPeNDAP
-Version: 3.18.3
-Release: 5%{?dist}
+Version: 3.18.1
+Release: 2%{?dist}
 
 License: LGPLv2+
 Group: Development/Libraries
@@ -9,6 +9,10 @@ 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
 Patch0: libdap-offline.patch
+# Fix getopt() usage again
+Patch1: libdap-getopt.patch
+# https://github.com/OPENDAP/libdap4/commit/fb5ea7a3554d0cbd0e287b27b9c0b5c06b5c0388
+Patch2: libdap-big-endian-baselines.patch
 
 # For autoreconf
 BuildRequires: libtool
@@ -63,6 +67,8 @@ Documentation of the libdap library.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .offline
+%patch1 -p1 -b .getopt
+%patch2 -p1 -b .baselines
 iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
 touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
 mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
@@ -131,25 +137,6 @@ make check
 
 
 %changelog
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Jan 11 2017 Orion Poplawski <orion@cora.nwra.com> - 3.18.3-1
-- Update to 3.18.3
-
-* Tue Dec 6 2016 Orion Poplawski <orion@cora.nwra.com> - 3.18.2-1
-- Update to 3.18.2
-- Drop getopt and big endian baselines patches applied upstream
-
 * Fri Aug 26 2016 Dan Horák <dan[at]danny.cz> - 3.18.1-2
 - Add missing big endian baselines (#1366787)
 

sources

@@ -1 +1 @@
-SHA512 (libdap-3.18.3.tar.gz) = 49be4fbd55c90bcc0c2ec23345642204f76f79d4eb05f44e7584cb58d2dddc9f3238dcb3baf9823b19d7c5d87aeb868be5d2426bd2c8f0ae344dc3a42217416e
+9bdca37f89dca3e1df2239ceb32f74a8  libdap-3.18.1.tar.gz