From 4dd9d7413d6afa6e4a2adf534cf8d035485ef30a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 6 Dec 2016 16:28:40 -0700 Subject: [PATCH] Update to 3.18.2 - Drop getopt and big endian baselines patches applied upstream --- .gitignore | 1 + libdap-big-endian-baselines.patch | 173 ------------------------------ libdap-getopt.patch | 12 --- libdap.spec | 14 ++- sources | 2 +- 5 files changed, 8 insertions(+), 194 deletions(-) delete mode 100644 libdap-big-endian-baselines.patch delete mode 100644 libdap-getopt.patch diff --git a/.gitignore b/.gitignore index 01ae20c..063407c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ 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 diff --git a/libdap-big-endian-baselines.patch b/libdap-big-endian-baselines.patch deleted file mode 100644 index 5366e10..0000000 --- a/libdap-big-endian-baselines.patch +++ /dev/null @@ -1,173 +0,0 @@ -commit fb5ea7a3554d0cbd0e287b27b9c0b5c06b5c0388 -Author: Dan Horák -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 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ d5c902a7 -+ -+ -+ -+ -+ -+ d2207316 -+ -+ -+ -+ -+ -+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 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ 55708e52 -+ -+ -+ -+ -+ -+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 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ 55708e52 -+ -+ -+ -+ -+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 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ 55708e52 -+ -+ -+ -+ -+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 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ d2207316 -+ -+ -+ -+ -+ -+The data: -+{ {"Silly test string: 1", "Silly test string: 1", "Silly test string: 1", "Silly test string: 1", "Silly test string: 1"} } diff --git a/libdap-getopt.patch b/libdap-getopt.patch deleted file mode 100644 index f21ac2d..0000000 --- a/libdap-getopt.patch +++ /dev/null @@ -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) { diff --git a/libdap.spec b/libdap.spec index 2ef854f..380985c 100644 --- a/libdap.spec +++ b/libdap.spec @@ -1,7 +1,7 @@ Name: libdap Summary: The C++ DAP2 library from OPeNDAP -Version: 3.18.1 -Release: 2%{?dist} +Version: 3.18.2 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries @@ -9,10 +9,6 @@ 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 @@ -67,8 +63,6 @@ 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 @@ -137,6 +131,10 @@ make check %changelog +* Tue Dec 6 2016 Orion Poplawski - 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 - 3.18.1-2 - Add missing big endian baselines (#1366787) diff --git a/sources b/sources index b9a93cb..c15e6b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9bdca37f89dca3e1df2239ceb32f74a8 libdap-3.18.1.tar.gz +9bf02561f35ae0731a814c086a966962 libdap-3.18.2.tar.gz