Release 4.2.14
This commit is contained in:
parent
5a3082c485
commit
17f9b88dac
|
@ -7,3 +7,4 @@ hdf-4.2.5.tar.bz2
|
|||
/hdf-4.2.11.tar.bz2
|
||||
/hdf-4.2.12.tar.bz2
|
||||
/hdf-4.2.13.tar.bz2
|
||||
/hdf-4.2.14.tar.bz2
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
diff -up hdf/examples/Makefile.am hdf-4.2.12/hdf/examples/Makefile.am
|
||||
--- hdf/examples/Makefile.am 2017-01-31 14:41:51.947802481 -0700
|
||||
+++ hdf/examples/Makefile.am 2017-01-31 14:42:34.883572782 -0700
|
||||
diff -up a/hdf/examples/Makefile.am b/hdf/examples/Makefile.am
|
||||
--- a/hdf/examples/Makefile.am 2017-01-31 14:41:51.947802481 -0700
|
||||
+++ b/hdf/examples/Makefile.am 2017-01-31 14:42:34.883572782 -0700
|
||||
@@ -46,8 +46,8 @@
|
||||
INSTALL_TOP_FILES = README
|
||||
|
||||
|
@ -12,9 +12,9 @@ diff -up hdf/examples/Makefile.am hdf-4.2.12/hdf/examples/Makefile.am
|
|||
|
||||
# How to build C programs using h4cc
|
||||
$(EXTRA_PROG): $(H4CC)
|
||||
diff -up hdf/fortran/examples/Makefile.am hdf/fortran/examples/Makefile.am
|
||||
--- hdf/fortran/examples/Makefile.am 2017-01-31 14:41:51.949802471 -0700
|
||||
+++ hdf/fortran/examples/Makefile.am 2017-01-31 14:43:07.968395906 -0700
|
||||
diff -up a/hdf/fortran/examples/Makefile.am b/hdf/fortran/examples/Makefile.am
|
||||
--- a/hdf/fortran/examples/Makefile.am 2017-01-31 14:41:51.949802471 -0700
|
||||
+++ b/hdf/fortran/examples/Makefile.am 2017-01-31 14:43:07.968395906 -0700
|
||||
@@ -41,7 +41,7 @@
|
||||
INSTALL_SCRIPT_FILES = run-fortran-ex.sh
|
||||
|
||||
|
@ -24,9 +24,9 @@ diff -up hdf/fortran/examples/Makefile.am hdf/fortran/examples/Makefile.am
|
|||
|
||||
# How to build Fortran programs using h4fc
|
||||
$(EXTRA_PROG): $(H4FC)
|
||||
diff -up mfhdf/examples/Makefile.am mfhdf/examples/Makefile.am
|
||||
--- mfhdf/examples/Makefile.am 2017-01-31 14:41:51.950802465 -0700
|
||||
+++ mfhdf/examples/Makefile.am 2017-01-31 14:43:23.376314066 -0700
|
||||
diff -up a/mfhdf/examples/Makefile.am b/mfhdf/examples/Makefile.am
|
||||
--- a/mfhdf/examples/Makefile.am 2017-01-31 14:41:51.950802465 -0700
|
||||
+++ b/mfhdf/examples/Makefile.am 2017-01-31 14:43:23.376314066 -0700
|
||||
@@ -23,7 +23,7 @@
|
||||
SD_get_info.c SD_find_sds_by_name.c SD_set_get_dim_info.c \
|
||||
SD_dimscale_vs_sds.c SD_set_attr.c SD_get_attr.c SD_chunking_example.c
|
||||
|
@ -36,9 +36,9 @@ diff -up mfhdf/examples/Makefile.am mfhdf/examples/Makefile.am
|
|||
|
||||
# How to build programs using h4cc
|
||||
$(EXTRA_PROG): $(H4CC)
|
||||
diff -up mfhdf/fortran/examples/Makefile.am mfhdf/fortran/examples/Makefile.am
|
||||
--- mfhdf/fortran/examples/Makefile.am 2017-01-31 14:41:51.952802455 -0700
|
||||
+++ mfhdf/fortran/examples/Makefile.am 2017-01-31 14:43:40.206224672 -0700
|
||||
diff -up a/mfhdf/fortran/examples/Makefile.am b/mfhdf/fortran/examples/Makefile.am
|
||||
--- a/mfhdf/fortran/examples/Makefile.am 2017-01-31 14:41:51.952802455 -0700
|
||||
+++ b/mfhdf/fortran/examples/Makefile.am 2017-01-31 14:43:40.206224672 -0700
|
||||
@@ -24,7 +24,7 @@
|
||||
SD_set_attr.f SD_get_attr.f SD_compress_sds.f SD_chunking_example.f
|
||||
|
||||
|
|
43
hdf.spec
43
hdf.spec
|
@ -3,13 +3,12 @@
|
|||
%endif
|
||||
|
||||
Name: hdf
|
||||
Version: 4.2.13
|
||||
Release: 11%{?dist}
|
||||
Version: 4.2.14
|
||||
Release: 1%{?dist}
|
||||
Summary: A general purpose library and file format for storing scientific data
|
||||
License: BSD
|
||||
Group: System Environment/Libraries
|
||||
URL: http://hdfgroup.org/products/hdf4/index.html
|
||||
Source0: ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/%{name}-%{version}.tar.bz2
|
||||
URL: https://portal.hdfgroup.org/
|
||||
Source0: https://support.hdfgroup.org/ftp/HDF/releases/HDF%{version}/src/%{name}-%{version}.tar.bz2
|
||||
Patch0: hdf-4.2.5-maxavailfiles.patch
|
||||
Patch1: hdf-ppc.patch
|
||||
Patch2: hdf-4.2.4-sparc.patch
|
||||
|
@ -46,7 +45,6 @@ grids. You can also mix and match them in HDF files according to your needs.
|
|||
|
||||
%package devel
|
||||
Summary: HDF development files
|
||||
Group: Development/Libraries
|
||||
Provides: %{name}-static = %{version}-%{release}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: libjpeg-devel%{?_isa}
|
||||
|
@ -58,27 +56,31 @@ HDF development headers and libraries.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch0 -p1 -b .maxavailfiles
|
||||
%patch1 -p1 -b .ppc
|
||||
%patch2 -p1 -b .sparc
|
||||
%patch3 -p1 -b .s390
|
||||
%patch4 -p1 -b .arm
|
||||
%patch5 -p1 -b .destdir
|
||||
%patch6 -p0 -b .examplesdir
|
||||
%patch6 -p1 -b .examplesdir
|
||||
%patch8 -p1 -b .aarch64
|
||||
%patch9 -p1 -b .ppc64le
|
||||
|
||||
## Fix syntax error bacause 'CLASSPATH_ENV=$H4_CLASSPATH' line on epel6 builds
|
||||
# Use only if java is disabled
|
||||
%if 0%{?rhel} < 7
|
||||
%if 0%{?rhel} && 0%{?rhel} < 7
|
||||
%patch10 -p0
|
||||
%endif
|
||||
|
||||
chmod a-x *hdf/*/*.c hdf/*/*.h
|
||||
find . -type f -name "*.h" -exec chmod 0644 '{}' \;
|
||||
find . -type f -name "*.c" -exec chmod 0644 '{}' \;
|
||||
|
||||
# restore include file timestamps modified by patching
|
||||
touch -c -r ./hdf/src/hdfi.h.ppc ./hdf/src/hdfi.h
|
||||
|
||||
%build
|
||||
|
||||
# For destdir/examplesdir patches
|
||||
autoreconf -vif
|
||||
# avoid upstream compiler flags settings
|
||||
|
@ -103,7 +105,10 @@ touch -c -r mfhdf/fortran/mffunc.inc mfhdf/fortran/mffunc.f90
|
|||
%install
|
||||
%make_install
|
||||
|
||||
install -pm 644 MANIFEST README.txt release_notes/*.txt %{buildroot}%{_pkgdocdir}/
|
||||
|
||||
rm -f %{buildroot}%{_libdir}/%{name}/*.la
|
||||
rm -f %{buildroot}%{_libdir}/*.la
|
||||
|
||||
#Don't conflict with netcdf
|
||||
for file in ncdump ncgen; do
|
||||
|
@ -123,33 +128,25 @@ touch -c -r h4config.h h4config.h.tmp
|
|||
mv h4config.h.tmp h4config.h
|
||||
popd
|
||||
|
||||
# ./testdhf fails on f28-i386 only with
|
||||
# --> /bin/sh: line 25: 22535 Segmentation fault (core dumped) srcdir="." ./${tname} >> ${log} 2>&1
|
||||
# but not by an arch-override=i386 ?!
|
||||
%if 0%{?fedora} >= 28
|
||||
%ifnarch %{ix86}
|
||||
%check
|
||||
make -j1 check
|
||||
%endif
|
||||
%endif
|
||||
%if 0%{?fedora} < 28
|
||||
%check
|
||||
make -j1 check
|
||||
%endif
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc MANIFEST README.txt release_notes/*.txt
|
||||
%exclude %{_defaultdocdir}/%{name}/examples
|
||||
%{_pkgdocdir}/
|
||||
%exclude %{_pkgdocdir}/examples
|
||||
%{_bindir}/*
|
||||
%{_mandir}/man1/*.gz
|
||||
|
||||
%files devel
|
||||
%{_includedir}/%{name}/
|
||||
%{_libdir}/%{name}/
|
||||
%{_defaultdocdir}/%{name}/examples
|
||||
%{_pkgdocdir}/examples/
|
||||
|
||||
%changelog
|
||||
* Sat Nov 03 2018 Antonio Trande <sagitter@fedoraproject.org> 4.2.14-1
|
||||
- Release 4.2.14
|
||||
|
||||
* Sun Oct 7 2018 Orion Poplawski <orion@nwra.com> - 4.2.13-11
|
||||
- Use LIBS instead of LDFLAGS for -ltirpc
|
||||
|
||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
SHA512 (hdf-4.2.13.tar.bz2) = d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
|
||||
SHA512 (hdf-4.2.14.tar.bz2) = 5689525e18bfc6be205a0a21cded68d66630020c9a1445ce5afae41d58246e26ed9ba349da1bb197c31557aba127f51a2b697a868ec7e2747ac6153858171718
|
||||
|
|
Loading…
Reference in New Issue