Update to 3.18.2
- Drop getopt and big endian baselines patches applied upstream
This commit is contained in:
parent
fa2afd60df
commit
4dd9d7413d
1
.gitignore
vendored
1
.gitignore
vendored
@ -12,3 +12,4 @@ libdap-3.10.2.tar.gz
|
|||||||
/version-3.17.1.tar.gz
|
/version-3.17.1.tar.gz
|
||||||
/libdap-3.17.2.tar.gz
|
/libdap-3.17.2.tar.gz
|
||||||
/libdap-3.18.1.tar.gz
|
/libdap-3.18.1.tar.gz
|
||||||
|
/libdap-3.18.2.tar.gz
|
||||||
|
@ -1,173 +0,0 @@
|
|||||||
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"} }
|
|
@ -1,12 +0,0 @@
|
|||||||
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) {
|
|
14
libdap.spec
14
libdap.spec
@ -1,7 +1,7 @@
|
|||||||
Name: libdap
|
Name: libdap
|
||||||
Summary: The C++ DAP2 library from OPeNDAP
|
Summary: The C++ DAP2 library from OPeNDAP
|
||||||
Version: 3.18.1
|
Version: 3.18.2
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
@ -9,10 +9,6 @@ URL: http://www.opendap.org/
|
|||||||
Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz
|
Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz
|
||||||
#Don't run HTTP tests - builders don't have network connections
|
#Don't run HTTP tests - builders don't have network connections
|
||||||
Patch0: libdap-offline.patch
|
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
|
# For autoreconf
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
@ -67,8 +63,6 @@ Documentation of the libdap library.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}
|
%setup -q -n %{name}-%{version}
|
||||||
%patch0 -p1 -b .offline
|
%patch0 -p1 -b .offline
|
||||||
%patch1 -p1 -b .getopt
|
|
||||||
%patch2 -p1 -b .baselines
|
|
||||||
iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
|
iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
|
||||||
touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
|
touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
|
||||||
mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
|
mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
|
||||||
@ -137,6 +131,10 @@ make check
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* Fri Aug 26 2016 Dan Horák <dan[at]danny.cz> - 3.18.1-2
|
||||||
- Add missing big endian baselines (#1366787)
|
- Add missing big endian baselines (#1366787)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user