From 4f4ee6d0092d1c1d17d55f1e8ae828f4cf5c1e3a Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Thu, 12 Nov 2020 19:47:19 +0100 Subject: [PATCH] - updated to 4.2.15 - updated link patch - added tirpc patch; build with libtirpc to support glibc 2.32+ --- hdf-link.patch | 31 ++++++++++++++++++++++--------- hdf-tirpc.patch | 10 ++++++++++ hdf.spec | 27 ++++++++++++--------------- 3 files changed, 44 insertions(+), 24 deletions(-) create mode 100644 hdf-tirpc.patch diff --git a/hdf-link.patch b/hdf-link.patch index c5c9c62..9bcfc0b 100644 --- a/hdf-link.patch +++ b/hdf-link.patch @@ -1,15 +1,28 @@ ---- hdf-4.2.9/mfhdf/libsrc/Makefile.am.orig 2013-03-02 19:33:21.082121674 +0100 -+++ hdf-4.2.9/mfhdf/libsrc/Makefile.am 2013-03-02 19:34:51.572117878 +0100 -@@ -32,10 +32,11 @@ - else +--- hdf-4.2.15/mfhdf/libsrc/Makefile.am.orig 2020-03-03 18:40:50.000000000 +0100 ++++ hdf-4.2.15/mfhdf/libsrc/Makefile.am 2020-11-12 06:21:46.537767787 +0100 +@@ -33,7 +33,7 @@ libmfhdf_la_SOURCES = $(CSOURCES) endif -+libmfhdf_la_LIBADD = $(top_builddir)/hdf/src/libdf.la - if HDF_BUILD_XDR - XDRLIB = $(top_builddir)/mfhdf/xdr/libxdr.la -libmfhdf_la_LIBADD = $(XDRLIB) -+libmfhdf_la_LIBADD += $(XDRLIB) - endif ++libmfhdf_la_LIBADD = $(LIBHDF) $(XDRLIB) if HDF_BUILD_NETCDF + include_HEADERS = hdf2netcdf.h local_nc.h mfhdf.h netcdf.h mfhdfi.h mfdatainfo.h +--- hdf-4.2.15/config/commence.am.orig 2020-03-03 18:40:50.000000000 +0100 ++++ hdf-4.2.15/config/commence.am 2020-11-12 06:25:05.443356890 +0100 +@@ -27,14 +27,6 @@ + H4CC = ${DESTDIR}$(bindir)/h4cc + H4FC = ${DESTDIR}$(bindir)/h4fc + +-if HDF_BUILD_XDR +- XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs +-endif +- +-if HDF_BUILD_SHARED +- AM_LDFLAGS = -R$(abs_top_builddir)/mfhdf/libsrc/.libs -R$(abs_top_builddir)/hdf/src/.libs $(XDR_ADD) +-endif +- + ACLOCAL_AMFLAGS = "-I m4" + + # .chkexe files are used to mark tests that have run successfully. diff --git a/hdf-tirpc.patch b/hdf-tirpc.patch new file mode 100644 index 0000000..a89dcf3 --- /dev/null +++ b/hdf-tirpc.patch @@ -0,0 +1,10 @@ +--- hdf-4.2.15/configure.ac.orig 2020-11-11 21:29:50.130673804 +0100 ++++ hdf-4.2.15/configure.ac 2020-11-11 22:31:12.350725506 +0100 +@@ -701,6 +701,7 @@ + if test -z "$HAVE_OLDRPC" ; then + LIBS="$LIBS -ltirpc" + CPPFLAGS="$SYSCPPFLAGS -I/usr/include/tirpc" ++ unset ac_cv_header_rpc_rpc_h + AC_CHECK_HEADER([rpc/rpc.h],[:], [unset HAVE_TIRPC]) + if test -z "$HAVE_TIRPC" ; then + CPPFLAGS="$SYSCPPFLAGS" diff --git a/hdf.spec b/hdf.spec index 6f15e5a..8fd82d6 100644 --- a/hdf.spec +++ b/hdf.spec @@ -5,20 +5,21 @@ Summary: Hierarchical Data Format library Summary(pl.UTF-8): Biblioteka HDF (Hierarchical Data Format) Name: hdf -Version: 4.2.14 +Version: 4.2.15 Release: 1 Epoch: 1 Group: Libraries License: Nearly BSD, but changed sources must be marked Source0: https://support.hdfgroup.org/ftp/HDF/releases/HDF%{version}/src/hdf-%{version}.tar.bz2 -# Source0-md5: 3f3bd5da84015e9221d26fb5a80094b4 +# Source0-md5: 27ab87b22c31906883a0bfaebced97cb Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2 # Source1-md5: 607df78cacc131b37dfdb443e61e789a Patch0: %{name}-shared.patch Patch1: %{name}-morearchs.patch Patch2: %{name}-link.patch Patch3: %{name}-szip.patch -URL: https://support.hdfgroup.org/products/hdf4/ +Patch4: %{name}-tirpc.patch +URL: http://portal.hdfgroup.org/display/HDF4/HDF4 BuildRequires: autoconf >= 2.50 BuildRequires: automake BuildRequires: bison @@ -26,16 +27,13 @@ BuildRequires: flex BuildRequires: gcc-fortran BuildRequires: groff BuildRequires: libjpeg-devel >= 6b +BuildRequires: libtirpc-devel BuildRequires: libtool >= 2:1.4d-3 -BuildRequires: netcdf-devel %{?with_szip:BuildRequires: szip-devel >= 2.0} BuildRequires: which BuildRequires: zlib-devel >= 1.1.4 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -# because of mfhdf/hdfimport/hdfimport.c false positives (const strings as format arguments) -%define filterout_c -Werror=format-security - %description HDF is a multi-object file format that facilitates the transfer of various types of scientific data between machines and operating @@ -66,6 +64,7 @@ Summary(pl.UTF-8): Pliki nagłówkowe biblioteki HDF Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Requires: libjpeg-devel >= 6b +Requires: libtirpc-devel %{?with_szip:Requires: szip-devel >= 2.0} Requires: zlib-devel >= 1.1.4 @@ -116,9 +115,7 @@ Przykładowe programy dla biblioteki HDF (w postaci źródłowej). %patch1 -p1 %patch2 -p1 %patch3 -p1 - -# evil -R -sed -i '/^if HDF_BUILD_XDR/,/^endif/d;/^if HDF_BUILD_SHARED/,/^endif/d' config/commence.am +%patch4 -p1 %build %{__libtoolize} @@ -147,15 +144,15 @@ install -d $RPM_BUILD_ROOT{%{_mandir}/man{3,7},%{_includedir}/hdf} EXAMPLETOPDIR=$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \ EXAMPLEDIR=$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/c \ -mv -f $RPM_BUILD_ROOT%{_includedir}/*.{h,inc,f90} $RPM_BUILD_ROOT%{_includedir}/hdf +%{__mv} $RPM_BUILD_ROOT%{_includedir}/*.{h,inc,f90} $RPM_BUILD_ROOT%{_includedir}/hdf -install man/gr_chunk.3 $RPM_BUILD_ROOT%{_mandir}/man3 -mv -f $RPM_BUILD_ROOT%{_mandir}/man1/hdf.1 $RPM_BUILD_ROOT%{_mandir}/man7/hdf.7 +cp -p man/gr_chunk.3 $RPM_BUILD_ROOT%{_mandir}/man3 +%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/hdf.1 $RPM_BUILD_ROOT%{_mandir}/man7/hdf.7 # resolve conflict with netcdf for i in ncdump ncgen ; do - mv -f $RPM_BUILD_ROOT%{_bindir}/$i $RPM_BUILD_ROOT%{_bindir}/hdf$i - mv -f $RPM_BUILD_ROOT%{_mandir}/man1/$i.1 $RPM_BUILD_ROOT%{_mandir}/man1/hdf$i.1 + %{__mv} $RPM_BUILD_ROOT%{_bindir}/$i $RPM_BUILD_ROOT%{_bindir}/hdf$i + %{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/$i.1 $RPM_BUILD_ROOT%{_mandir}/man1/hdf$i.1 done bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} -- 2.44.0