[packages/libdap] Up to 3.21.1

[arekm]

commit 0218af5c9455a2539b22deb22fae02d22b700809
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Jul 17 17:07:42 2025 +0200

    Up to 3.21.1

 libdap-sh.patch    | 11 -----------
 libdap-tirpc.patch | 14 +++++++-------
 libdap.spec        |  8 +++-----
 3 files changed, 10 insertions(+), 23 deletions(-)
---
diff --git a/libdap.spec b/libdap.spec
index e23ba5f..d8847ee 100644
--- a/libdap.spec
+++ b/libdap.spec
@@ -5,15 +5,14 @@
 Summary:	OPeNDAP C++ implementation of the Data Access Protocol
 Summary(pl.UTF-8):	OPeNDAP - implementacja w C++ protokołu DAP (Data Access Protocol)
 Name:		libdap
-Version:	3.20.11
-Release:	2
+Version:	3.21.1
+Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	https://www.opendap.org/pub/source/%{name}-%{version}.tar.gz
-# Source0-md5:	2072499296f396a07d886537f0b86ccd
+# Source0-md5:	3170c52d1c4d18d3612b3f23a48f5073
 Patch0:		%{name}-tirpc.patch
 Patch1:		%{name}-config-no-libdirs.patch
-Patch2:		%{name}-sh.patch
 URL:		https://www.opendap.org/
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake
@@ -94,7 +93,6 @@ Statyczna biblioteka OPeNDAP.
 %setup -q
 %patch -P0 -p1
 %patch -P1 -p1
-%patch -P2 -p1
 
 %build
 %{__libtoolize}
diff --git a/libdap-sh.patch b/libdap-sh.patch
deleted file mode 100644
index c1df22c..0000000
--- a/libdap-sh.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libdap-3.20.11/conf/ox_rhel8_tirpc.m4.orig	2022-07-01 20:20:09.000000000 +0200
-+++ libdap-3.20.11/conf/ox_rhel8_tirpc.m4	2023-01-19 06:26:19.183531210 +0100
-@@ -27,7 +27,7 @@ AS_IF([test -f /etc/redhat-release && gr
-     dnl if this is RHEL8, then we need the tirpc library on CPPFLAGS and LDFLAGS
-     [
-         AC_MSG_NOTICE([Found a RHEL 8 or equivalent system...])
--        AS_IF([grep -q -v tirpc <<< $CPPFLAGS || grep -q -v tirpc <<< $LDFLAGS],
-+        AS_IF([echo $CPPFLAGS | grep -q -v tirpc || echo $LDFLAGS | grep -q -v tirpc],
-         dnl if either CPPFLAGS or LDFLAGS lack 'tirpc', error
-         [
-             AC_MSG_ERROR([Libdap4 on Redhat Linux 8 requires the tirpc library be included on CPPFLAGS and LDFLAGS])
diff --git a/libdap-tirpc.patch b/libdap-tirpc.patch
index ea8a345..9042950 100644
--- a/libdap-tirpc.patch
+++ b/libdap-tirpc.patch
@@ -1,11 +1,11 @@
---- libdap-3.20.6/conf/acinclude.m4.orig	2020-11-28 10:22:38.123706704 +0100
-+++ libdap-3.20.6/conf/acinclude.m4	2020-11-28 10:22:43.093679780 +0100
-@@ -564,6 +564,8 @@
- 	PKG_PROG_PKG_CONFIG([0.9.0])
+--- libdap-3.21.1/conf/acinclude.m4~	2025-01-14 00:03:54.000000000 +0100
++++ libdap-3.21.1/conf/acinclude.m4	2025-07-17 17:05:03.244189577 +0200
+@@ -565,6 +565,8 @@ AC_DEFUN([DODS_CHECK_SIZES], [dnl
  	PKG_CHECK_MODULES([TIRPC], [libtirpc >= 0.2.4],
- 		[dap_xdrlib=`echo "${TIRPC_LIBS}" | sed -e 's/^-l//'`
-+		TIRPC_PKG="libtirpc >= 0.2.4"
-+		AC_SUBST([TIRPC_PKG])
+ 		[dap_xdrlib=tirpc
+ 		LIBS="${TIRPC_LIBS} ${LIBS}"
++                TIRPC_PKG="libtirpc >= 0.2.4"
++                AC_SUBST([TIRPC_PKG])
  		AC_SUBST([TIRPC_CFLAGS])
  		AC_SUBST([TIRPC_LIBS])
  		AC_DEFINE([HAVE_LIBTIRPC], [1], [Define to 1 to use libtirpc.])],
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libdap.git/commitdiff/0218af5c9455a2539b22deb22fae02d22b700809