diff --git a/libdap-3.19.1-use-libtirpc.patch b/libdap-3.19.1-use-libtirpc.patch new file mode 100644 index 0000000..c057f68 --- /dev/null +++ b/libdap-3.19.1-use-libtirpc.patch @@ -0,0 +1,94 @@ +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 new file mode 100644 index 0000000..d0bc1c5 Binary files /dev/null and b/libdap-3.19.1.tar.gz differ diff --git a/libdap.spec b/libdap.spec new file mode 100644 index 0000000..ccc7b33 --- /dev/null +++ b/libdap.spec @@ -0,0 +1,82 @@ +Name: libdap +Version: 3.19.1 +Release: 3 +Summary: The DAP++ SDK +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 + +Provides: bundled(gnulib) + +%description +A C++ SDK which contains an implemention of DAP2.0 and DAP4.0.This includes both Client-side and +Server-side support classes. + +%package devel +Summary: Development and header files from libdap +Requires: %{name} = %{version}-%{release} automake curl-devel libxml2-devel pkgconfig + +%description devel +The package provides documents for applications which developed with %{name}. + +%package help +Summary: Help documents for %{name} +Provides: %{name}-doc = %{version}-%{release} +Obsoletes: %{name}-doc < %{version}-%{release} + +%description help +Man pages and other help documents for %{name}. + +%prep +%autosetup -n %{name}-%{version} -p1 + +%build +autoreconf -f -i +%configure --disable-dependency-tracking --disable-static +%make_build +make docs + +%install +%make_install INSTALL="%{__install} -p" +mkdir -p $RPM_BUILD_ROOT%{_libdir}/libdap +mv $RPM_BUILD_ROOT%{_libdir}/libtest-types.a $RPM_BUILD_ROOT%{_libdir}/libdap/ +mv $RPM_BUILD_ROOT%{_bindir}/dap-config-pkgconfig $RPM_BUILD_ROOT%{_bindir}/dap-config +rm -rf __dist_docs +cp -pr html __dist_docs +rm -f __dist_docs/*.map __dist_docs/*.md5 +touch -r ChangeLog __dist_docs/* + +%check +make check || : + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%license COPYRIGHT_W3C COPYING COPYRIGHT_URI +%{_bindir}/getdap* +%{_libdir}/*.so.* +%exclude %{_libdir}/*.la + +%files devel +%{_bindir}/dap-config +%{_libdir}/*.so +%{_libdir}/libdap/ +%{_libdir}/pkgconfig/libdap*.pc +%{_includedir}/libdap/ +%{_datadir}/aclocal/* + +%files help +%doc README README.dodsrc NEWS +%doc __dist_docs/ +%{_mandir}/man1/* + +%changelog +* Fri Mar 6 2020 zhouyihang - 3.19.1-3 +- Pakcage init