- new URLs, updated to 1.1.5

- removed obsolete hdf5-1.10 patch
- added fortran-check patch (fix build when FC is gfortran directly, not h5fc)
- tests succeed now, so enable by default

diff --git a/hdf5-1.10.patch b/hdf5-1.10.patch
deleted file mode 100644 (file)
index cd40cd4..0000000
--- a/hdf5-1.10.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- hdf5_HL_REGION-1.1.3/Makefile~     2019-12-08 23:56:49.000000000 +0100
-+++ hdf5_HL_REGION-1.1.3/Makefile      2019-12-09 00:03:00.733369598 +0100
-@@ -48,12 +48,6 @@
-    $(error "CONFIGURE ERROR: HDF5 library must be built with the --enable-fortran option")
-  endif
-  FC = $(HDF5_INSTALL_DIR)/bin/h5fc
--
--# check to make sure hdf5 was built with --enable-fortran2003
-- CHCK_H5FC2003:= $(strip $(shell $(FC) -showconfig | grep -i 2003))
-- ifneq ("$(CHCK_H5FC2003)","Fortran 2003 Compiler: yes")
--   $(error "CONFIGURE ERROR: HDF5 library must be built with the --enable-fortran2003 option")
-- endif
-  FORTRAN=true
- endif
- 

diff --git a/hdf5_hl_region-fortran-check.patch b/hdf5_hl_region-fortran-check.patch
new file mode 100644 (file)
index 0000000..c5ba133
--- /dev/null
+++ b/hdf5_hl_region-fortran-check.patch
@@ -0,0 +1,18 @@
+--- hdf5_HL_REGION-1.1.5/Makefile.orig 2019-12-26 18:04:48.693066151 +0100
++++ hdf5_HL_REGION-1.1.5/Makefile      2019-12-26 18:15:01.509746238 +0100
+@@ -47,12 +47,12 @@
+  ifeq (,$(wildcard $(HDF5_INSTALL_DIR)/bin/h5fc))
+    $(error "CONFIGURE ERROR: HDF5 library must be built with the --enable-fortran option")
+  endif
+- FC = $(HDF5_INSTALL_DIR)/bin/h5fc
++ H5FC = $(HDF5_INSTALL_DIR)/bin/h5fc
+ 
+ # check to make sure hdf5 was built with --enable-fortran2003 (needed for versions prior to 1.10)
+- CHCK_HDF5VER:= $(strip $(shell $(FC) -showconfig | grep -i "HDF5 Version:" | sed 's/^.* //g'))
++ CHCK_HDF5VER:= $(strip $(shell $(H5FC) -showconfig | grep -i "HDF5 Version:" | sed 's/^.* //g'))
+  ifeq "$(shell expr $(CHCK_HDF5VER) \<1.9)" "1"
+-   CHCK_H5FC2003:= $(strip $(shell $(FC) -showconfig | grep -i 2003))
++   CHCK_H5FC2003:= $(strip $(shell $(H5FC) -showconfig | grep -i 2003))
+    ifneq ("$(CHCK_H5FC2003)","Fortran 2003 Compiler: yes")
+      $(error "CONFIGURE ERROR: HDF5 library must be built with the --enable-fortran2003 option")
+    endif

diff --git a/hdf5_hl_region.spec b/hdf5_hl_region.spec
index c3f300c6960c1dc61e8b904ddea26527a386033b..36ace9b5fe938483899d6623dbbd9ed57fad93bf 100644 (file)
--- a/hdf5_hl_region.spec
+++ b/hdf5_hl_region.spec
@@ -1,23 +1,21 @@
 #
 # Conditional build:
 %bcond_without fortran         # Fortran API
-%bcond_with    tests           # perform "make tests" (reference dumps differ from current h5dump)
+%bcond_without tests           # perform "make tests"
 #
 Summary:       High-Level Library for handling HDF5 object and region references
 Summary(pl.UTF-8):     Wysokopoziomowa biblioteka do obsługi odniesień do obiektów i regionów HDF5
 Name:          hdf5_hl_region
-Version:       1.1.3
-Release:       5
+Version:       1.1.5
+Release:       1
 License:       BSD-like, changed sources must be marked
 Group:         Libraries
-Source0:       http://www.hdfgroup.uiuc.edu/ftp/pub/outgoing/NPOESS/source/hdf5_HL_REGION-%{version}.tar
-# Source0-md5: 72b64bca020e8657f4e54ca7d9dfa57d
+Source0:       https://gamma.hdfgroup.org/ftp/pub/outgoing/JPSS/HL_JPSS/hdf5_HL_REGION-%{version}.tar
+# Source0-md5: 0e07c7c76eba6e8180ef8973b245f821
 Patch0:                %{name}-shared.patch
 Patch1:                %{name}-destdir.patch
-Patch2:                hdf5-1.10.patch
-URL:           http://www.hdfgroup.org/projects/npoess/HL_index.html
-BuildRequires: autoconf >= 2.59
-BuildRequires: automake
+Patch2:                %{name}-fortran-check.patch
+URL:           http://portal.hdfgroup.org/display/support/Joint+Polar+Satellite+System+-+JPSS
 BuildRequires: hdf5-devel
 %{?with_fortran:BuildRequires: hdf5-fortran-devel}
 %{?with_tests:BuildRequires:   hdf5-progs}
@@ -128,7 +126,6 @@ Statyczna biblioteka HDF5 HL_REGION dla Fortranu.
        FC="%{_target_alias}-gfortran" \
        CCFLAGS="%{rpmcflags}" \
        FCFLAGS="%{rpmcflags}" \
-       CHCK_H5FC2003="Fortran 2003 Compiler: yes" \
        HDF5_INSTALL_DIR=/usr \
        HDF5_USE_SHLIB=yes \
        LIBDIR=%{_libdir} \