commit d31f411871e435ee86e58431d245954cc6e7e5a4
Author: Jakub Bogusz <[email protected]>
Date: Thu Jan 19 17:28:02 2023 +0100
- updated to 1.20.11 (new libdap soname)
- added sh patch (kill bashism in configure)
libdap-sh.patch | 11 +++++++++++
libdap-tirpc.patch | 14 +++++++-------
libdap.spec | 8 +++++---
3 files changed, 23 insertions(+), 10 deletions(-)
---
diff --git a/libdap.spec b/libdap.spec
index 0f5fb89..96fb1dc 100644
--- a/libdap.spec
+++ b/libdap.spec
@@ -5,14 +5,15 @@
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.6
+Version: 3.20.11
Release: 1
License: LGPL v2.1+
Group: Libraries
Source0: https://www.opendap.org/pub/source/%{name}-%{version}.tar.gz
-# Source0-md5: 314de766b550de9a53fe49570149f84f
+# Source0-md5: 2072499296f396a07d886537f0b86ccd
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
@@ -93,6 +94,7 @@ Statyczna biblioteka OPeNDAP.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%{__libtoolize}
@@ -128,7 +130,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/getdap
%attr(755,root,root) %{_bindir}/getdap4
%attr(755,root,root) %{_libdir}/libdap.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdap.so.25
+%attr(755,root,root) %ghost %{_libdir}/libdap.so.27
%attr(755,root,root) %{_libdir}/libdapclient.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libdapclient.so.6
%attr(755,root,root) %{_libdir}/libdapserver.so.*.*.*
diff --git a/libdap-sh.patch b/libdap-sh.patch
new file mode 100644
index 0000000..c1df22c
--- /dev/null
+++ b/libdap-sh.patch
@@ -0,0 +1,11 @@
+--- 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 208ae97..ea8a345 100644
--- a/libdap-tirpc.patch
+++ b/libdap-tirpc.patch
@@ -19,14 +19,14 @@
Libs: -L${libdir} -ldap
Libs.private: @xmlprivatelibs@ @PTHREAD_LIBS@
Requires.private: @xmlprivatereq@
---- libdap-3.20.6/dap-config.in.orig 2020-11-28 10:24:22.919805642 +0100
-+++ libdap-3.20.6/dap-config.in 2020-11-28 10:24:30.039767070 +0100
-@@ -56,7 +56,7 @@
- ;;
-
+--- libdap-3.20.11/dap-config.in.orig 2023-01-18 22:31:36.363868299 +0100
++++ libdap-3.20.11/dap-config.in 2023-01-18 22:32:15.696988547 +0100
+@@ -59,7 +59,7 @@ while test $# -gt 0; do
+ # which avoids issues with IDE warnings and will help later when there are
+ # two libdap libraries. jhrg 6/17/21
--cflags)
-- echo "-I${includedir}/libdap @XML2_CFLAGS@ @CURL_CFLAGS@"
-+ echo "-I${includedir}/libdap @XML2_CFLAGS@ @CURL_CFLAGS@ @TIRPC_CFLAGS@"
+- echo "-I${includedir} -I${includedir}/libdap @XML2_CFLAGS@
@CURL_CFLAGS@"
++ echo "-I${includedir} -I${includedir}/libdap @XML2_CFLAGS@
@CURL_CFLAGS@ @TIRPC_CFLAGS@"
;;
--libs)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libdap.git/commitdiff/d31f411871e435ee86e58431d245954cc6e7e5a4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
