- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
2018-02-07 21:25:01 +00:00 · 2017-08-03 01:19:32 +00:00 · 2017-07-26 18:41:31 +00:00 · 2017-02-10 18:30:51 +00:00 · 2017-01-11 21:57:43 -07:00 · 2016-12-06 16:28:40 -07:00
6 changed files with 50 additions and 466 deletions
--- a/.gitignore
+++ b/.gitignore
@ -11,3 +11,6 @@ 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
+/libdap-3.18.2.tar.gz
+/libdap-3.18.3.tar.gz
--- a/libdap-big-endian-baselines.patch
+++ b/libdap-big-endian-baselines.patch
@ -1,418 +0,0 @@
-From 080ce6905700259413076fb159f0ebb42235e2e5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
-Date: Thu, 14 Apr 2016 19:31:45 +0200
-Subject: [PATCH 1/2] add big endian baseline files for new tests
-
---
- .../big-endian/test_array_12.xml.intern_base       | 23 ++++++++++++++++
- .../big-endian/test_array_12.xml.trans_base        | 29 ++++++++++++++++++++
- .../big-endian/test_array_13.xml.intern_base       | 25 +++++++++++++++++
- .../big-endian/test_array_13.xml.trans_base        | 31 ++++++++++++++++++++++
- .../big-endian/test_array_14.xml.intern_base       | 25 +++++++++++++++++
- .../big-endian/test_array_14.xml.trans_base        | 31 ++++++++++++++++++++++
- .../big-endian/test_array_9.xml.intern_base        | 17 ++++++++++++
- .../big-endian/test_array_9.xml.trans_base         | 20 ++++++++++++++
- .../big-endian/test_simple_6.2.xml.intern_base     | 13 +++++++++
- .../big-endian/test_simple_6.2.xml.trans_base      | 17 ++++++++++++
- .../big-endian/test_simple_6.3.xml.intern_base     | 21 +++++++++++++++
- .../big-endian/test_simple_6.3.xml.trans_base      | 24 +++++++++++++++++
- 12 files changed, 276 insertions(+)
- create mode 100644 tests/dmr-testsuite/big-endian/test_array_12.xml.intern_base
- create mode 100644 tests/dmr-testsuite/big-endian/test_array_12.xml.trans_base
- create mode 100644 tests/dmr-testsuite/big-endian/test_array_13.xml.intern_base
- create mode 100644 tests/dmr-testsuite/big-endian/test_array_13.xml.trans_base
- create mode 100644 tests/dmr-testsuite/big-endian/test_array_14.xml.intern_base
- create mode 100644 tests/dmr-testsuite/big-endian/test_array_14.xml.trans_base
- create mode 100644 tests/dmr-testsuite/big-endian/test_array_9.xml.intern_base
- create mode 100644 tests/dmr-testsuite/big-endian/test_array_9.xml.trans_base
- create mode 100644 tests/dmr-testsuite/big-endian/test_simple_6.2.xml.intern_base
- create mode 100644 tests/dmr-testsuite/big-endian/test_simple_6.2.xml.trans_base
- create mode 100644 tests/dmr-testsuite/big-endian/test_simple_6.3.xml.intern_base
- create mode 100644 tests/dmr-testsuite/big-endian/test_simple_6.3.xml.trans_base
-
-diff --git a/tests/dmr-testsuite/big-endian/test_array_12.xml.intern_base b/tests/dmr-testsuite/big-endian/test_array_12.xml.intern_base
-new file mode 100644
-index 0000000..c83cac0
--- /dev/null
-+++ b/tests/dmr-testsuite/big-endian/test_array_12.xml.intern_base
-@@ -0,0 +1,23 @@
-+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
-+    <Int32 name="i">
-+        <Dim size="5"/>
-+    </Int32>
-+    <Int32 name="x">
-+        <Dim size="0"/>
-+    </Int32>
-+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
-+    <Int32 name="i">
-+        <Dim size="5"/>
-+    </Int32>
-+    <Int32 name="x">
-+        <Dim size="0"/>
-+    </Int32>
-+</Dataset>
-+
-+The data:
-+{ {123456789, 123456789, 123456789, 123456789, 123456789}, {} }
-diff --git a/tests/dmr-testsuite/big-endian/test_array_12.xml.trans_base b/tests/dmr-testsuite/big-endian/test_array_12.xml.trans_base
-new file mode 100644
-index 0000000..306fe92
--- /dev/null
-+++ b/tests/dmr-testsuite/big-endian/test_array_12.xml.trans_base
-@@ -0,0 +1,29 @@
-+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
-+    <Int32 name="i">
-+        <Dim size="5"/>
-+    </Int32>
-+    <Int32 name="x">
-+        <Dim size="0"/>
-+    </Int32>
-+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
-+    <Int32 name="i">
-+        <Dim size="5"/>
-+        <Attribute name="DAP4_Checksum_CRC32" type="String">
-+            <Value>ebd5bedf</Value>
-+        </Attribute>
-+    </Int32>
-+    <Int32 name="x">
-+        <Dim size="0"/>
-+        <Attribute name="DAP4_Checksum_CRC32" type="String">
-+            <Value>00000000</Value>
-+        </Attribute>
-+    </Int32>
-+</Dataset>
-+
-+The data:
-+{ {123456789, 123456789, 123456789, 123456789, 123456789}, {} }
-diff --git a/tests/dmr-testsuite/big-endian/test_array_13.xml.intern_base b/tests/dmr-testsuite/big-endian/test_array_13.xml.intern_base
-new file mode 100644
-index 0000000..4dde012
--- /dev/null
-+++ b/tests/dmr-testsuite/big-endian/test_array_13.xml.intern_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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
-+    <Int32 name="i">
-+        <Dim size="5"/>
-+    </Int32>
-+    <Int32 name="x">
-+        <Dim size="4"/>
-+        <Dim size="0"/>
-+    </Int32>
-+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
-+    <Int32 name="i">
-+        <Dim size="5"/>
-+    </Int32>
-+    <Int32 name="x">
-+        <Dim size="4"/>
-+        <Dim size="0"/>
-+    </Int32>
-+</Dataset>
-+
-+The data:
-+{ {123456789, 123456789, 123456789, 123456789, 123456789}, {{},{},{},{}} }
-diff --git a/tests/dmr-testsuite/big-endian/test_array_13.xml.trans_base b/tests/dmr-testsuite/big-endian/test_array_13.xml.trans_base
-new file mode 100644
-index 0000000..21e4274
--- /dev/null
-+++ b/tests/dmr-testsuite/big-endian/test_array_13.xml.trans_base
-@@ -0,0 +1,31 @@
-+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
-+    <Int32 name="i">
-+        <Dim size="5"/>
-+    </Int32>
-+    <Int32 name="x">
-+        <Dim size="4"/>
-+        <Dim size="0"/>
-+    </Int32>
-+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
-+    <Int32 name="i">
-+        <Dim size="5"/>
-+        <Attribute name="DAP4_Checksum_CRC32" type="String">
-+            <Value>ebd5bedf</Value>
-+        </Attribute>
-+    </Int32>
-+    <Int32 name="x">
-+        <Dim size="4"/>
-+        <Dim size="0"/>
-+        <Attribute name="DAP4_Checksum_CRC32" type="String">
-+            <Value>00000000</Value>
-+        </Attribute>
-+    </Int32>
-+</Dataset>
-+
-+The data:
-+{ {123456789, 123456789, 123456789, 123456789, 123456789}, {{},{},{},{}} }
-diff --git a/tests/dmr-testsuite/big-endian/test_array_14.xml.intern_base b/tests/dmr-testsuite/big-endian/test_array_14.xml.intern_base
-new file mode 100644
-index 0000000..99eeb81
--- /dev/null
-+++ b/tests/dmr-testsuite/big-endian/test_array_14.xml.intern_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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
-+    <Int32 name="i">
-+        <Dim size="5"/>
-+    </Int32>
-+    <Int32 name="x">
-+        <Dim size="0"/>
-+        <Dim size="4"/>
-+    </Int32>
-+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
-+    <Int32 name="i">
-+        <Dim size="5"/>
-+    </Int32>
-+    <Int32 name="x">
-+        <Dim size="0"/>
-+        <Dim size="4"/>
-+    </Int32>
-+</Dataset>
-+
-+The data:
-+{ {123456789, 123456789, 123456789, 123456789, 123456789}, {} }
-diff --git a/tests/dmr-testsuite/big-endian/test_array_14.xml.trans_base b/tests/dmr-testsuite/big-endian/test_array_14.xml.trans_base
-new file mode 100644
-index 0000000..84f92ae
--- /dev/null
-+++ b/tests/dmr-testsuite/big-endian/test_array_14.xml.trans_base
-@@ -0,0 +1,31 @@
-+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
-+    <Int32 name="i">
-+        <Dim size="5"/>
-+    </Int32>
-+    <Int32 name="x">
-+        <Dim size="0"/>
-+        <Dim size="4"/>
-+    </Int32>
-+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
-+    <Int32 name="i">
-+        <Dim size="5"/>
-+        <Attribute name="DAP4_Checksum_CRC32" type="String">
-+            <Value>ebd5bedf</Value>
-+        </Attribute>
-+    </Int32>
-+    <Int32 name="x">
-+        <Dim size="0"/>
-+        <Dim size="4"/>
-+        <Attribute name="DAP4_Checksum_CRC32" type="String">
-+            <Value>00000000</Value>
-+        </Attribute>
-+    </Int32>
-+</Dataset>
-+
-+The data:
-+{ {123456789, 123456789, 123456789, 123456789, 123456789}, {} }
-diff --git a/tests/dmr-testsuite/big-endian/test_array_9.xml.intern_base b/tests/dmr-testsuite/big-endian/test_array_9.xml.intern_base
-new file mode 100644
-index 0000000..2f53699
--- /dev/null
-+++ b/tests/dmr-testsuite/big-endian/test_array_9.xml.intern_base
-@@ -0,0 +1,17 @@
-+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
-+    <Int32 name="x">
-+        <Dim size="0"/>
-+    </Int32>
-+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
-+    <Int32 name="x">
-+        <Dim size="0"/>
-+    </Int32>
-+</Dataset>
-+
-+The data:
-+{ {} }
-diff --git a/tests/dmr-testsuite/big-endian/test_array_9.xml.trans_base b/tests/dmr-testsuite/big-endian/test_array_9.xml.trans_base
-new file mode 100644
-index 0000000..e24d475
--- /dev/null
-+++ b/tests/dmr-testsuite/big-endian/test_array_9.xml.trans_base
-@@ -0,0 +1,20 @@
-+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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
-+    <Int32 name="x">
-+        <Dim size="0"/>
-+    </Int32>
-+</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_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
-+    <Int32 name="x">
-+        <Dim size="0"/>
-+        <Attribute name="DAP4_Checksum_CRC32" type="String">
-+            <Value>00000000</Value>
-+        </Attribute>
-+    </Int32>
-+</Dataset>
-+
-+The data:
-+{ {} }
-diff --git a/tests/dmr-testsuite/big-endian/test_simple_6.2.xml.intern_base b/tests/dmr-testsuite/big-endian/test_simple_6.2.xml.intern_base
-new file mode 100644
-index 0000000..014c72e
--- /dev/null
-+++ b/tests/dmr-testsuite/big-endian/test_simple_6.2.xml.intern_base
-@@ -0,0 +1,13 @@
-+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_simple_6.2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.2">
-+    <Structure name="s"/>
-+</Dataset>
-+
-+<?xml version="1.0" encoding="ISO-8859-1"?>
-+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_simple_6.2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.2">
-+    <Structure name="s"/>
-+</Dataset>
-+
-+The data:
-+{ {  } }
-diff --git a/tests/dmr-testsuite/big-endian/test_simple_6.2.xml.trans_base b/tests/dmr-testsuite/big-endian/test_simple_6.2.xml.trans_base
-new file mode 100644
-index 0000000..b393e3f
--- /dev/null
-+++ b/tests/dmr-testsuite/big-endian/test_simple_6.2.xml.trans_base
-@@ -0,0 +1,17 @@
-+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_simple_6.2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.2">
-+    <Structure name="s"/>
-+</Dataset>
-+
-+<?xml version="1.0" encoding="ISO-8859-1"?>
-+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_simple_6.2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.2">
-+    <Structure name="s">
-+        <Attribute name="DAP4_Checksum_CRC32" type="String">
-+            <Value>00000000</Value>
-+        </Attribute>
-+    </Structure>
-+</Dataset>
-+
-+The data:
-+{ {  } }
-diff --git a/tests/dmr-testsuite/big-endian/test_simple_6.3.xml.intern_base b/tests/dmr-testsuite/big-endian/test_simple_6.3.xml.intern_base
-new file mode 100644
-index 0000000..c0ea6cc
--- /dev/null
-+++ b/tests/dmr-testsuite/big-endian/test_simple_6.3.xml.intern_base
-@@ -0,0 +1,21 @@
-+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_simple_6.3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.3">
-+    <Structure name="s">
-+        <Int32 name="i1"/>
-+        <String name="s"/>
-+        <Structure name="inner"/>
-+    </Structure>
-+</Dataset>
-+
-+<?xml version="1.0" encoding="ISO-8859-1"?>
-+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_simple_6.3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.3">
-+    <Structure name="s">
-+        <Int32 name="i1"/>
-+        <String name="s"/>
-+        <Structure name="inner"/>
-+    </Structure>
-+</Dataset>
-+
-+The data:
-+{ { 123456789, "Silly test string: 1", {  } } }
-diff --git a/tests/dmr-testsuite/big-endian/test_simple_6.3.xml.trans_base b/tests/dmr-testsuite/big-endian/test_simple_6.3.xml.trans_base
-new file mode 100644
-index 0000000..d260d64
--- /dev/null
-+++ b/tests/dmr-testsuite/big-endian/test_simple_6.3.xml.trans_base
-@@ -0,0 +1,24 @@
-+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_simple_6.3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.3">
-+    <Structure name="s">
-+        <Int32 name="i1"/>
-+        <String name="s"/>
-+        <Structure name="inner"/>
-+    </Structure>
-+</Dataset>
-+
-+<?xml version="1.0" encoding="ISO-8859-1"?>
-+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_simple_6.3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.3">
-+    <Structure name="s">
-+        <Int32 name="i1"/>
-+        <String name="s"/>
-+        <Structure name="inner"/>
-+        <Attribute name="DAP4_Checksum_CRC32" type="String">
-+            <Value>63dceb61</Value>
-+        </Attribute>
-+    </Structure>
-+</Dataset>
-+
-+The data:
-+{ { 123456789, "Silly test string: 1", {  } } }
-
-From c88a7588892ccaa22954c32bd2f606005d5d3e92 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
-Date: Thu, 14 Apr 2016 19:34:52 +0200
-Subject: [PATCH 2/2] remove the condition because we added the missing
- baselines
-
---
- tests/DMRTest.at | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/tests/DMRTest.at b/tests/DMRTest.at
-index 93e3b58..3ab1b38 100644
--- a/tests/DMRTest.at
-+++ b/tests/DMRTest.at
-@@ -240,12 +240,6 @@ DMR_PARSE([dmr-testsuite/test_array_14.xml], [pass])
- DMR_PARSE([dmr-testsuite/test_simple_6.2.xml], [pass])
- DMR_PARSE([dmr-testsuite/test_simple_6.3.xml], [pass])
- 
-# These tests for zero-length array values only work for
-# little-endian machines at this time. If baselines for
-# big-endian machines are built, this AS_IF can be removed.
-#  jhrg 1/28/16
-AS_IF([test "$WORD_ORDER" = "little-endian"],
-[
- DMR_TRANS([test_array_9.xml], [pass])
- DMR_TRANS([test_array_12.xml], [pass])
- DMR_TRANS([test_array_13.xml], [pass])
-@@ -263,9 +257,6 @@ DMR_INTERN([test_array_14.xml], [pass])
- DMR_INTERN([test_simple_6.2.xml], [pass])
- DMR_INTERN([test_simple_6.3.xml], [pass])
- 
-],
-[])
-
- # Test various facets of the CE parser and evaluation engine
- 
- DMR_TRANS_CE([test_array_4.xml], [a], [test_array_4.xml.1.trans_base], [pass])
--- a/libdap-cppunit.patch
+++ b/libdap-cppunit.patch
@ -1,30 +0,0 @@
-From 08f3403fb6bea17775dacc51c055b3b46f425326 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
-Date: Fri, 15 Apr 2016 11:06:42 +0200
-Subject: [PATCH] fallback to pkg-config if cppunit-config is not available
-
-Recent version of cppunit packages do not distribute the cppunit-config script
-and expect the usage of pkgconfig file.
---
- configure.ac | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2a7f158..9467a87 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -305,7 +305,13 @@ AC_SUBST([UUID_LIBS])
- 
- AM_PATH_CPPUNIT(1.12.0,
- 	[AM_CONDITIONAL([CPPUNIT], [true])],
-	[AM_CONDITIONAL([CPPUNIT], [false])])
-+	[
-+	    PKG_CHECK_MODULES(CPPUNIT, [cppunit >= 1.12.0],
-+		[AM_CONDITIONAL([CPPUNIT], [true])],
-+		[AM_CONDITIONAL([CPPUNIT], [false])]
-+	    )
-+	]
-+)
- 
- DODS_DEBUG_OPTION
- 
--- 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 \
--- a/libdap.spec
+++ b/libdap.spec
@ -1,18 +1,18 @@
 Name: libdap
 Summary: The C++ DAP2 library from OPeNDAP
-Version: 3.17.2
-Release: 1%{?dist}
+Version: 3.18.3
+Release: 5%{?dist}

 License: LGPLv2+
 Group: Development/Libraries
 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
+Patch0: libdap-offline.patch

 # For autoreconf
 BuildRequires: libtool
-BuildRequires: bison
+BuildRequires: bison >= 3.0
 BuildRequires: cppunit-devel
 BuildRequires: curl-devel
 BuildRequires: doxygen
@ -22,7 +22,7 @@ BuildRequires: libuuid-devel
 BuildRequires: libxml2-devel
 BuildRequires: openssl-devel
 BuildRequires: pkgconfig
-%ifnarch s390
+%ifnarch s390 %{mips}
 BuildRequires: valgrind
 %endif

@ -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,40 @@ 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
+* 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)
+
+* Fri Aug 12 2016 Orion Poplawski <orion@cora.nwra.com> - 3.18.1-1
+- Update to 3.18.1
+- Add patch to fix getopt usage again
+
+* Thu Aug 11 2016 Michal Toman <mtoman@fedoraproject.org> - 3.17.2-2
+- No valgrind on MIPS
+
 * Fri Apr 15 2016 Than Ngo <than@redhat.com> - 3.17.2-1
 - update to 3.17.2

--- a/2
+++ b/2
@ -1 +1 @@
-d8051a36df74a13d1bb912fe9704776f  libdap-3.17.2.tar.gz
+SHA512 (libdap-3.18.3.tar.gz) = 49be4fbd55c90bcc0c2ec23345642204f76f79d4eb05f44e7584cb58d2dddc9f3238dcb3baf9823b19d7c5d87aeb868be5d2426bd2c8f0ae344dc3a42217416e
Author	SHA1	Message	Date
Fedora Release Engineering	14bb839254	- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2018-02-07 21:25:01 +00:00
Fedora Release Engineering	e48dc1c148	- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild	2017-08-03 01:19:32 +00:00
Fedora Release Engineering	bba33af9d8	- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild	2017-07-26 18:41:31 +00:00
Fedora Release Engineering	711e5876af	- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild	2017-02-10 18:30:51 +00:00
Orion Poplawski	101db36da2	Update to 3.18.3	2017-01-11 21:57:43 -07:00
Orion Poplawski	4dd9d7413d	Update to 3.18.2 - Drop getopt and big endian baselines patches applied upstream	2016-12-06 16:28:40 -07:00
Dan Horák	fa2afd60df	- Add missing big endian baselines (#1366787 )	2016-08-26 22:02:40 +02:00
Orion Poplawski	63c77afdee	Add patch to fix getopt usage again	2016-08-12 15:09:07 -06:00
Orion Poplawski	90875a3a30	Update to 3.18.1	2016-08-12 10:01:58 -06:00
Orion Poplawski	39935ff19b	No valgrind on MIPS	2016-08-12 09:29:23 -06:00