commit 33c0a3ae925447245df6e09ee4b48a0ff49877a4
Author: Jakub Bogusz <[email protected]>
Date: Sat Nov 28 20:43:50 2020 +0100
- updated to 3.20.6
- added tirpc patch (included tirpc includes in `-config --cflags` output
for XDR headers included in libdap headers)
- added config-no-libdirs (drop -L/usr/lib -L/usr/lib64 from `dap-config
--libs` output)
libdap-config-no-libdirs.patch | 34 ++++++++++++++++++++++++++++++++++
libdap-tirpc.patch | 32 ++++++++++++++++++++++++++++++++
libdap.spec | 10 +++++++---
3 files changed, 73 insertions(+), 3 deletions(-)
---
diff --git a/libdap.spec b/libdap.spec
index 2a578b6..0f5fb89 100644
--- a/libdap.spec
+++ b/libdap.spec
@@ -5,12 +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.3
+Version: 3.20.6
Release: 1
License: LGPL v2.1+
Group: Libraries
Source0: https://www.opendap.org/pub/source/%{name}-%{version}.tar.gz
-# Source0-md5: c17c4131b807430592311b8c11f297fb
+# Source0-md5: 314de766b550de9a53fe49570149f84f
+Patch0: %{name}-tirpc.patch
+Patch1: %{name}-config-no-libdirs.patch
URL: https://www.opendap.org/
BuildRequires: autoconf >= 2.63
BuildRequires: automake
@@ -89,6 +91,8 @@ Statyczna biblioteka OPeNDAP.
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
@@ -97,7 +101,7 @@ Statyczna biblioteka OPeNDAP.
%{__autoheader}
%{__automake}
%configure
-# libcrypto is actually not used (as of 3.20.2)
+# libcrypto is actually not used (as of 3.20.6)
%{__make} \
CRYPTO_LIBS=
diff --git a/libdap-config-no-libdirs.patch b/libdap-config-no-libdirs.patch
new file mode 100644
index 0000000..41ca469
--- /dev/null
+++ b/libdap-config-no-libdirs.patch
@@ -0,0 +1,34 @@
+--- libdap-3.20.6/dap-config.in.orig 2020-11-28 10:24:30.039767070 +0100
++++ libdap-3.20.6/dap-config.in 2020-11-28 10:25:07.199565758 +0100
+@@ -4,8 +4,6 @@
+ #
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
+-libdir64=${exec_prefix}/lib64
+ includedir=${prefix}/include
+
+ usage()
+@@ -60,7 +58,7 @@
+ ;;
+
+ --libs)
+- echo "-L${libdir64} -L${libdir} -ldap -ldapserver -ldapclient
@CURL_LIBS@ @XML2_LIBS@ @PTHREAD_LIBS@ @UUID_LIBS@ @LIBS@"
++ echo "-ldap -ldapserver -ldapclient @CURL_LIBS@ @XML2_LIBS@
@PTHREAD_LIBS@ @UUID_LIBS@ @LIBS@"
+ ;;
+ #
+ # Changed CURL_STATIC_LIBS to CURL_LIBS because the former was including a
+@@ -69,11 +67,11 @@
+ # jhrg 2/7/12
+
+ --server-libs)
+- echo "-L${libdir64} -L${libdir} -ldap -ldapserver @XML2_LIBS@
@PTHREAD_LIBS@ @UUID_LIBS@ @LIBS@"
++ echo "-ldap -ldapserver @XML2_LIBS@ @PTHREAD_LIBS@ @UUID_LIBS@
@LIBS@"
+ ;;
+
+ --client-libs)
+- echo "-L${libdir64} -L${libdir} -ldap -ldapclient @CURL_LIBS@
@XML2_LIBS@ @PTHREAD_LIBS@ @UUID_LIBS@ @LIBS@"
++ echo "-ldap -ldapclient @CURL_LIBS@ @XML2_LIBS@ @PTHREAD_LIBS@
@UUID_LIBS@ @LIBS@"
+ ;;
+
+ --prefix)
diff --git a/libdap-tirpc.patch b/libdap-tirpc.patch
new file mode 100644
index 0000000..208ae97
--- /dev/null
+++ b/libdap-tirpc.patch
@@ -0,0 +1,32 @@
+--- 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])
+ 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])
+ AC_SUBST([TIRPC_CFLAGS])
+ AC_SUBST([TIRPC_LIBS])
+ AC_DEFINE([HAVE_LIBTIRPC], [1], [Define to 1 to use
libtirpc.])],
+--- libdap-3.20.6/libdap.pc.in.orig 2017-05-19 02:47:13.000000000 +0200
++++ libdap-3.20.6/libdap.pc.in 2020-11-28 10:22:57.230269862 +0100
+@@ -8,6 +8,7 @@
+ Name: @PACKAGE@
+ Description: Common items for the OPeNDAP C++ implementation of the Data
Access Protocol
+ Version: @VERSION@
++Requires: @TIRPC_PKG@
+ 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 @@
+ ;;
+
+ --cflags)
+- echo "-I${includedir}/libdap @XML2_CFLAGS@ @CURL_CFLAGS@"
++ echo "-I${includedir}/libdap @XML2_CFLAGS@ @CURL_CFLAGS@ @TIRPC_CFLAGS@"
+ ;;
+
+ --libs)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libdap.git/commitdiff/33c0a3ae925447245df6e09ee4b48a0ff49877a4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
