diff --git a/0001-libdap-offline.patch b/0001-libdap-offline.patch new file mode 100644 index 0000000000000000000000000000000000000000..2ecf385fb382c99c2e591f72e3d7b33dd1adcf8f --- /dev/null +++ b/0001-libdap-offline.patch @@ -0,0 +1,28 @@ +diff --git a/tests/Makefile.am b/tests/Makefile.am +index d325e52..123e73d 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -122,7 +122,6 @@ $(EXPRTESTSUITE) $(DMRTESTSUITE) $(GETDAPTESTSUITE) + $(SHELL) '$(DDSTESTSUITE)' $(TESTSUITEFLAGS) + $(SHELL) '$(EXPRTESTSUITE)' $(TESTSUITEFLAGS) + $(SHELL) '$(DMRTESTSUITE)' $(TESTSUITEFLAGS) +- $(SHELL) '$(GETDAPTESTSUITE)' $(TESTSUITEFLAGS) + + # Make sure there are no spaces after the DASTESTSUITE names. jhrg 3/16/15 + # Delete the scripts here and not using CLEANFILES because this target is +diff --git a/unit-tests/Makefile.am b/unit-tests/Makefile.am +index 58ecd20..abbf860 100644 +--- a/unit-tests/Makefile.am ++++ b/unit-tests/Makefile.am +@@ -85,9 +85,9 @@ D4-xml.tar.gz: D4-xml/DMR_*[0-9].xml + if CPPUNIT + UNIT_TESTS = marshT arrayT attrTableT structT sequenceT ddsT dasT \ + RegexTest ArrayTest GridTest AttrTableTest ByteTest MIMEUtilTest ancT DASTest \ +- DDSTest DDXParserTest generalUtilTest HTTPConnectTest parserUtilTest \ ++ DDSTest DDXParserTest generalUtilTest parserUtilTest \ + RCReaderTest SequenceTest SignalHandlerTest MarshallerTest \ +- HTTPCacheTest ServerFunctionsListUnitTest Int8Test Int16Test UInt16Test \ ++ ServerFunctionsListUnitTest Int8Test Int16Test UInt16Test \ + Int32Test UInt32Test Int64Test UInt64Test Float32Test Float64Test \ + D4BaseTypeFactoryTest BaseTypeFactoryTest util_mitTest + diff --git a/libdap-3.19.1-use-libtirpc.patch b/libdap-3.19.1-use-libtirpc.patch deleted file mode 100644 index c057f68c4dbedafa5832abab531919cac7043c72..0000000000000000000000000000000000000000 --- a/libdap-3.19.1-use-libtirpc.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index f5dab89..8c90f30 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I conf -I gl/m4 - aclocaldir=$(datadir)/aclocal - pkgconfigdir=$(libdir)/pkgconfig - --AM_CPPFLAGS = -I$(top_builddir)/gl -I$(top_srcdir)/gl -I$(top_srcdir)/GNU $(XML2_CFLAGS) -+AM_CPPFLAGS = -I$(top_builddir)/gl -I$(top_srcdir)/gl -I$(top_srcdir)/GNU $(XML2_CFLAGS) $(TIRPC_CFLAGS) - AM_CXXFLAGS = - - if COMPILER_IS_GCC -@@ -47,7 +47,7 @@ man_MANS = getdap.1 dap-config.1 getdap4.1 - groff -t -e -mandoc -Tascii $< | col -bx > $@ - - libparsers_la_SOURCES = $(FLEX_SRC) $(BISON_SRC) --libparsers_la_CPPFLAGS = $(XML2_CFLAGS) -+libparsers_la_CPPFLAGS = $(XML2_CFLAGS) $(TIRPC_CFLAGS) - libparsers_la_LIBADD = $(XML2_LIBS) - - libdap_la_SOURCES = $(DAP_SRC) $(GNU_SRC) -diff --git a/conf/acinclude.m4 b/conf/acinclude.m4 -index 63a17e7..df3d7c9 100644 ---- a/conf/acinclude.m4 -+++ b/conf/acinclude.m4 -@@ -558,12 +558,23 @@ AC_DEFUN([DODS_CHECK_SIZES], [dnl - # - # Unfortunately, there is little commonality about xdr - -- # First, we need to see if the xdr routines are in libc, librpc, -+ # First, we need to see if the xdr routines are in libtirpc, libc, librpc, - # or librpcsvc or libnsl - dap_xdrlib= -- AC_SEARCH_LIBS([xdr_void],[c rpc nsl rpcsvc],[ -- dap_xdrlib=`echo $ac_res|sed -e 's/^-l//'`],[ -- AC_MSG_WARN(Cannot locate library containing xdr functions.)]) -+ PKG_PROG_PKG_CONFIG([0.9.0]) -+ PKG_CHECK_MODULES([TIRPC], [libtirpc >= 0.2.4], -+ [dap_xdrlib=`echo "${TIRPC_LIBS}" | sed -e 's/^-l//'` -+ AC_SUBST([TIRPC_CFLAGS]) -+ AC_SUBST([TIRPC_LIBS]) -+ AC_DEFINE([HAVE_LIBTIRPC], [1], [Define to 1 to use libtirpc.])], -+ [dap_xdrlib=""] -+ ) -+ AS_IF( -+ [test "$dap_xdrlib" = ""], -+ [AC_SEARCH_LIBS([xdr_void],[c rpc nsl rpcsvc],[ -+ dap_xdrlib=`echo $ac_res|sed -e 's/^-l//'`],[ -+ AC_MSG_WARN(Cannot locate library containing xdr functions.)])]) -+ - # Added for autoconf 2.59 which appears to not use/set $ac_res. jhrg - if test -z "$dap_xdrlib" ; then dap_xdrlib=c; fi - if test "$dap_xdrlib" = "none required" ; then dap_xdrlib=c; fi -diff --git a/d4_ce/Makefile.am b/d4_ce/Makefile.am -index aa1a070..fcae7a4 100644 ---- a/d4_ce/Makefile.am -+++ b/d4_ce/Makefile.am -@@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = foreign - .NOTPARALLEL: - - # Arrange to build with the backward compatibility mode enabled. --AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/d4_ce -I$(srcdir) $(XML2_CFLAGS) -+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/d4_ce -I$(srcdir) $(XML2_CFLAGS) $(TIRPC_CFLAGS) - AM_CXXFLAGS = - - if COMPILER_IS_GCC -diff --git a/tests/Makefile.am b/tests/Makefile.am -index f32e7d0..d51d255 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign - - # Arrange to build with the backward compatibility mode enabled. - AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/GNU -I$(top_srcdir)/d4_ce \ ---I$(top_srcdir)/d4_function $(XML2_CFLAGS) $(CURL_CFLAGS) -+-I$(top_srcdir)/d4_function $(XML2_CFLAGS) $(CURL_CFLAGS) $(TIRPC_CFLAGS) - AM_CXXFLAGS = - - if COMPILER_IS_GCC -diff --git a/unit-tests/Makefile.am b/unit-tests/Makefile.am -index be70132..c5ae5e7 100644 ---- a/unit-tests/Makefile.am -+++ b/unit-tests/Makefile.am -@@ -7,7 +7,8 @@ AUTOMAKE_OPTIONS = foreign - - # Headers in 'tests' are used by the arrayT unit tests. - --AM_CPPFLAGS = -I$(top_srcdir)/GNU -I$(top_srcdir) -I$(top_srcdir)/tests $(CURL_CFLAGS) $(XML2_CFLAGS) -+AM_CPPFLAGS = -I$(top_srcdir)/GNU -I$(top_srcdir) -I$(top_srcdir)/tests \ -+$(CURL_CFLAGS) $(XML2_CFLAGS) $(TIRPC_CFLAGS) - AM_LDADD = $(XML2_LIBS) - AM_CXXFLAGS = - # CXXFLAGS = diff --git a/libdap-3.19.1.tar.gz b/libdap-3.19.1.tar.gz deleted file mode 100644 index d0bc1c526431dff5027ae8f87cff3e6bffc80d83..0000000000000000000000000000000000000000 Binary files a/libdap-3.19.1.tar.gz and /dev/null differ diff --git a/libdap-3.21.0.27.tar.gz b/libdap-3.21.0.27.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..33e2dd7ae19beaa3633844f68df329ce81421058 Binary files /dev/null and b/libdap-3.21.0.27.tar.gz differ diff --git a/libdap.spec b/libdap.spec index ccc7b3312392a068cb89a95ed2494525fd772f46..a29f8c9706748890e9d8a23a31669e3f8e08c539 100644 --- a/libdap.spec +++ b/libdap.spec @@ -1,16 +1,31 @@ +%global libdap_tag 3.21.0-27 Name: libdap -Version: 3.19.1 -Release: 3 -Summary: The DAP++ SDK +Version: 3.21.0.27 +Release: 1 +Summary: The C++ DAP2 and DAP4 library from OPeNDAP. License: LGPLv2+ URL: http://www.opendap.org/ -Source0: http://www.opendap.org/pub/source/%{name}-%{version}.tar.gz - -Patch0000: https://raw.githubusercontent.com/funtoo/science-kit/master/sci-libs/libdap/files/libdap-3.19.1-use-libtirpc.patch - -BuildRequires: bison >= 3.0 cppunit-devel curl-devel doxygen flex gcc-c++ graphviz libtirpc-devel -BuildRequires: libtool libuuid-devel libxml2-devel openssl-devel pkgconfig valgrind - +Source0: https://github.com/OPENDAP/libdap4/archive/%{libdap_tag}/%{name}-%{version}.tar.gz + +# Remark HTTP tests - builders don't have network connections +Patch0: 0001-libdap-offline.patch + +BuildRequires: make +BuildRequires: gcc-c++ +# For autoreconf +BuildRequires: libtool +BuildRequires: bison >= 3.0 +BuildRequires: cppunit-devel +BuildRequires: curl-devel +BuildRequires: doxygen +BuildRequires: flex +BuildRequires: graphviz +BuildRequires: libtirpc-devel +BuildRequires: libuuid-devel +BuildRequires: libxml2-devel +BuildRequires: openssl-devel +BuildRequires: pkgconfig +BuildRequires: valgrind Provides: bundled(gnulib) %description @@ -33,7 +48,7 @@ Obsoletes: %{name}-doc < %{version}-%{release} Man pages and other help documents for %{name}. %prep -%autosetup -n %{name}-%{version} -p1 +%autosetup -n libdap4-%{libdap_tag} -p1 %build autoreconf -f -i @@ -73,10 +88,18 @@ make check || : %{_datadir}/aclocal/* %files help -%doc README README.dodsrc NEWS +%doc README.md README.dodsrc NEWS %doc __dist_docs/ %{_mandir}/man1/* %changelog +* Mon Mar 11 2024 Dongxing Wang - 3.21.0.27-1 +- Update package to version 3.21.0.27 + Added libdap::Array::rename_dim() for HK-247 + Added new Direct I/O support so that modules written using libdap can pass compressed data buffers + Fix handling of libtirpc pkg-config files with -L flags + Moved the functionality of is_dap4_projected() into libdap4 + Added support for 64-bit sized arrays + * Fri Mar 6 2020 zhouyihang - 3.19.1-3 - Pakcage init