- add -fallow-argument-mismatch to fix Fortran build with gcc 10

[packages/hdf.git] / hdf.spec

diff --git a/hdf.spec b/hdf.spec
index 08dd0379e9670b466bc352bdf69d577c15602551..7760888476126558c74fc4668db6ff3bc2f570f2 100644 (file)
--- 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.13
-Release:       2
+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: 2c1b6c7fdf97738251154680b37bd86a
+# 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,14 @@ BuildRequires:      flex
 BuildRequires: gcc-fortran
 BuildRequires: groff
 BuildRequires: libjpeg-devel >= 6b
+BuildRequires: libtirpc-devel
 BuildRequires: libtool >= 2:1.4d-3
-BuildRequires: netcdf-devel
+BuildRequires: rpmbuild(macros) >= 1.750
 %{?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 +65,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 +116,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}
@@ -127,11 +125,15 @@ sed -i '/^if HDF_BUILD_XDR/,/^endif/d;/^if HDF_BUILD_SHARED/,/^endif/d' config/c
 %{__autoheader}
 %{__automake}
 # need to pass F77 to override F77=g77 in config/linux-gnu
-%configure \
 %ifarch x32
-       F77="x86_64-pld-linux-gnux32-gfortran" \
+%define        gfortran        x86_64-pld-linux-gnux32-gfortran
 %else
-       F77="%{_target_cpu}-pld-linux-gfortran" \
+%define        gfortran        %{_target_cpu}-pld-linux-gfortran
+%endif
+%configure \
+       F77="%{gfortran}" \
+%if "%{_ver_ge '%(%{gfortran} -dumpversion)' '10.0'}" == "1"
+       FFLAGS="%{rpmcflags} -fallow-argument-mismatch" \
 %endif
        --enable-shared \
        %{?with_szip:--with-szlib}
@@ -147,15 +149,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}