New upstream version 3.21.0-27, required by bes (RHBZ#1328287)

Remove old patches

.gitignore

@@ -1,24 +1 @@
-libdap-3.10.2.tar.gz
+/libdap-*.tar.gz
-/libdap-3.11.0.tar.gz
-/libdap-3.11.1.tar.gz
-/libdap-3.11.3.tar.gz
-/libdap-3.11.7.tar.gz
-/libdap-3.13.1.tar.gz
-/libdap-3.13.3.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
-/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-3.19.1.tar.gz
-/libdap-3.20.3.tar.gz
-/libdap-3.20.4.tar.gz
-/libdap-3.20.5.tar.gz
-/libdap-3.20.6.tar.gz
-/libdap-3.20.8.tar.gz
-/libdap-3.20.9.tar.gz
-/libdap-3.20.10.tar.gz

192.patch

@@ -1,26 +0,0 @@
-From 5ccb4f14b0c620bf0271b00cb47770bca4c2439c Mon Sep 17 00:00:00 2001
-From: ndp-opendap <ndp@opendap.org>
-Date: Fri, 8 Jul 2022 08:23:02 -0700
-Subject: [PATCH] Fixing type issue in HTTPCache.cc
-
----
- HTTPCache.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/HTTPCache.cc b/HTTPCache.cc
-index 56e912be..f2b34214 100644
---- a/HTTPCache.cc
-+++ b/HTTPCache.cc
-@@ -1028,10 +1028,10 @@ HTTPCache::read_metadata(const string &cachename, vector<string> &headers)
-                           "Could not open named cache entry meta data file.");
-     }
- 
--    const unsigned long line_buf_len = 1024;
-+    const size_t line_buf_len = 1024;
-     char line[line_buf_len];
-     while (!feof(md) && fgets(line, line_buf_len, md)) {
--        line[min(line_buf_len, strnlen(line, line_buf_len))-1] = '\0'; // erase newline
-+        line[std::min(line_buf_len, strnlen(line, line_buf_len))-1] = '\0'; // erase newline
-         headers.push_back(string(line));
-     }
- 

libdap-include.patch

@@ -1,11 +0,0 @@
-diff -up libdap-3.20.10/Constructor.cc.include libdap-3.20.10/Constructor.cc
---- libdap-3.20.10/Constructor.cc.include	2022-06-26 15:55:00.000000000 -0600
-+++ libdap-3.20.10/Constructor.cc	2023-01-17 07:23:47.199638401 -0700
-@@ -31,6 +31,7 @@
- 
- #include "config.h"
- 
-+#include <cstdint>
- #include <string>
- #include <sstream>
- #include <algorithm>

libdap.spec

@@ -1,18 +1,15 @@
 Name: libdap
-Summary: The C++ DAP2 library from OPeNDAP
+Summary: The C++ DAP2 and DAP4 library from OPeNDAP
-Version: 3.20.10
+Version: 3.21.0.27
-Release: 6%{?dist}
+Release: 1%{?dist}
+
+%global libdap_tag 3.21.0-27
 
 License: LGPL-2.1-or-later
 URL: http://www.opendap.org/
-Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz
+Source0: https://github.com/OPENDAP/libdap4/archive/%{libdap_tag}/%{name}-%{version}.tar.gz
 #Don't run HTTP tests - builders don't have network connections
 Patch0: libdap-offline.patch
-# Fix for i686 build
-Patch1: https://github.com/OPENDAP/libdap4/pull/192.patch
-# Add missing includes for gcc 13
-# https://github.com/OPENDAP/libdap4/pull/215
-Patch2: libdap-include.patch
 
 BuildRequires: make
 BuildRequires: gcc-c++
@@ -37,11 +34,11 @@ Provides: bundled(gnulib)
 
 
 %description
-The libdap++ library contains an implementation of DAP2. This package
+The libdap++ library contains an implementation of DAP2 and DAP4. This
-contains the library, dap-config, and getdap. The script dap-config
+package contains the library, dap-config, and getdap. The script
-simplifies using the library in other projects. The getdap utility is a
+dap-config simplifies using the library in other projects. The getdap
-simple command-line tool to read from DAP2 servers. It is built using the
+utility is a simple command-line tool to read from DAP2 servers. It is
-library and demonstrates simple uses of it.
+built using the library and demonstrates simple uses of it.
 
 
 %package devel
@@ -66,7 +63,7 @@ Documentation of the libdap library.
 
 
 %prep
-%autosetup -n %{name}-%{version} -p1
+%autosetup -n libdap4-%{libdap_tag} -p1
 iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
 touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
 mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
@@ -134,6 +131,10 @@ make check || :
 
 
 %changelog
+* Fri Feb 23 2024 Richard W.M. Jones <rjones@redhat.com> - 3.21.0.27-1
+- New upstream version 3.21.0-27, required by bes (RHBZ#1328287)
+- Remove old patches
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.10-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (libdap-3.20.10.tar.gz) = a3e58550eb4153a3c9c11fcfba56d87e56273ada6c25c78f7bf04d38f533dd873d124ef52e5c8fa4b648c0bb08ad7295f06c3d23fa09abeea0b169bd03f95117
+SHA512 (libdap-3.21.0.27.tar.gz) = 22f240445adf7fbd0ba6c8639977ef662732fd8ecbfea2f9ebc9afa7c69b29c8e5a6437ebcd7c0d2b43bc120a804f4a471fda14165523191180e817ec1920f1c