diff --git a/.gitignore b/.gitignore index 6d13e7d..b046e3d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ libdap-3.10.2.tar.gz /libdap-3.14.0.tar.gz /libdap-3.15.1.tar.gz /libdap-3.16.0.tar.gz +/libdap-3.17.0.tar.gz diff --git a/libdap-gcc6.patch b/libdap-gcc6.patch new file mode 100644 index 0000000..65580b0 --- /dev/null +++ b/libdap-gcc6.patch @@ -0,0 +1,24 @@ +diff -up libdap-3.16.0/dds.yy.gcc6 libdap-3.16.0/dds.yy +--- libdap-3.16.0/dds.yy.gcc6 2015-10-19 16:03:35.000000000 -0600 ++++ libdap-3.16.0/dds.yy 2016-02-04 13:59:22.309817685 -0700 +@@ -262,7 +262,7 @@ declaration: base_type var ';' + | grid '{' SCAN_WORD ':' + { + if (is_keyword(string($3), "array")) { +- part = array; ++ part = libdap::array; + } + else { + ostringstream msg; +diff -up libdap-3.16.0/unit-tests/generalUtilTest.cc.gcc6 libdap-3.16.0/unit-tests/generalUtilTest.cc +--- libdap-3.16.0/unit-tests/generalUtilTest.cc.gcc6 2015-09-08 16:42:20.000000000 -0600 ++++ libdap-3.16.0/unit-tests/generalUtilTest.cc 2016-02-04 14:12:59.677136555 -0700 +@@ -265,7 +265,7 @@ CPPUNIT_TEST_SUITE(generalUtilTest); + DBG(cerr << "XXX" << unescattr("\\\"attr") << "XXX" << endl); + CPPUNIT_ASSERT(unescattr("\\\"attr") == "\"attr"); + +- char A_200_177[4] = { 128, 127, 'A', '\0' }; ++ char A_200_177[4] = { (char)128, 127, 'A', '\0' }; + DBG(cerr << "XXX" << unescattr("\\200\\177A") << "XXX" << endl); + CPPUNIT_ASSERT(unescattr("\\200\\177A") == string(A_200_177)); + diff --git a/libdap.spec b/libdap.spec index 7f44904..a548675 100644 --- a/libdap.spec +++ b/libdap.spec @@ -1,7 +1,7 @@ Name: libdap Summary: The C++ DAP2 library from OPeNDAP -Version: 3.16.0 -Release: 2%{?dist} +Version: 3.17.0 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries @@ -9,6 +9,8 @@ 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 gcc6/c++11 compile errors +Patch1: libdap-gcc6.patch # For autoreconf BuildRequires: libtool @@ -28,10 +30,6 @@ BuildRequires: valgrind Provides: bundled(gnulib) -# This package could be relocatable. In that case uncomment the following -# line -#Prefix: %{_prefix} - %description The libdap++ library contains an implementation of DAP2. This package @@ -67,6 +65,7 @@ Documentation of the libdap library. %prep %setup -q %patch0 -p1 -b .offline +%patch1 -p1 -b .libdap iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8 touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8 mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C @@ -135,6 +134,10 @@ make check %changelog +* Tue Feb 9 2016 Orion Poplawski - 3.17.0-1 +- Update to 3.17.0 +- Add patch for gcc 6 support + * Thu Feb 04 2016 Fedora Release Engineering - 3.16.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 46724b0..8771fdd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8c03ee8cf8d489c46fca140b23e82a7e libdap-3.16.0.tar.gz +ebeff3892b45fb95ea80fc6ffafb6448 libdap-3.17.0.tar.gz