Update to 4.8.0
This commit is contained in:
parent
93865f9075
commit
aeeda3c0d3
1
.gitignore
vendored
1
.gitignore
vendored
@ -19,3 +19,4 @@ netcdf-4.1.1.tar.gz
|
||||
/netcdf-4.6.3.tar.gz
|
||||
/netcdf-4.7.0.tar.gz
|
||||
/netcdf-4.7.3.tar.gz
|
||||
/netcdf-4.8.0.tar.gz
|
||||
|
12
netcdf-builddir.patch
Normal file
12
netcdf-builddir.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -up netcdf-c-4.8.0/lib_flags.am.builddir netcdf-c-4.8.0/lib_flags.am
|
||||
--- netcdf-c-4.8.0/lib_flags.am.builddir 2021-03-30 14:23:10.000000000 -0600
|
||||
+++ netcdf-c-4.8.0/lib_flags.am 2021-04-10 17:53:34.640271561 -0600
|
||||
@@ -6,7 +6,7 @@
|
||||
# libraries for netCDF-4.
|
||||
#
|
||||
|
||||
-AM_CPPFLAGS = -I$(top_srcdir)/include
|
||||
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
|
||||
AM_LDFLAGS =
|
||||
|
||||
if USE_DAP
|
15
netcdf-test.patch
Normal file
15
netcdf-test.patch
Normal file
@ -0,0 +1,15 @@
|
||||
diff -up netcdf-c-4.8.0/h5_test/tst_h_atts3.c.test netcdf-c-4.8.0/h5_test/tst_h_atts3.c
|
||||
--- netcdf-c-4.8.0/h5_test/tst_h_atts3.c.test 2021-03-30 14:23:10.000000000 -0600
|
||||
+++ netcdf-c-4.8.0/h5_test/tst_h_atts3.c 2021-04-10 18:36:38.490728048 -0600
|
||||
@@ -209,7 +209,11 @@ main()
|
||||
hid_t file_typeid1[NUM_OBJ_1], native_typeid1[NUM_OBJ_1];
|
||||
hid_t file_typeid2, native_typeid2;
|
||||
hsize_t num_obj;
|
||||
+#if H5_VERSION_GE(1,12,0)
|
||||
+ H5O_info2_t obj_info;
|
||||
+#else
|
||||
H5O_info_t obj_info;
|
||||
+#endif
|
||||
char obj_name[STR_LEN + 1];
|
||||
hsize_t dims[1] = {ATT_LEN}; /* netcdf attributes always 1-D. */
|
||||
|
34
netcdf.spec
34
netcdf.spec
@ -1,11 +1,17 @@
|
||||
%global sover 19
|
||||
|
||||
Name: netcdf
|
||||
Version: 4.7.3
|
||||
Release: 8%{?dist}
|
||||
Version: 4.8.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Libraries for the Unidata network Common Data Form
|
||||
|
||||
License: NetCDF
|
||||
URL: http://www.unidata.ucar.edu/software/netcdf/
|
||||
Source0: https://github.com/Unidata/netcdf-c/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
# Fix out of tree build include
|
||||
Patch0: netcdf-builddir.patch
|
||||
# Fix tests with hdf5 1.12.0
|
||||
Patch1: netcdf-test.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: libtool
|
||||
@ -27,12 +33,6 @@ Requires: hdf5%{?_isa} = %{_hdf5_version}
|
||||
|
||||
%global with_mpich 1
|
||||
%global with_openmpi 1
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 6
|
||||
%ifarch ppc64
|
||||
# No mpich on ppc64 in EL6
|
||||
%global with_mpich 0
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{with_mpich}
|
||||
%global mpi_list mpich
|
||||
@ -164,6 +164,7 @@ NetCDF parallel openmpi static libraries
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{name}-c-%{version}
|
||||
autoreconf -fiv
|
||||
|
||||
|
||||
%build
|
||||
@ -177,7 +178,7 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
|
||||
--enable-netcdf-4 \\\
|
||||
--enable-dap \\\
|
||||
--enable-extra-example-tests \\\
|
||||
CPPFLAGS=-I%{_includedir}/hdf \\\
|
||||
CPPFLAGS="-I%{_includedir}/hdf -DH5_USE_110_API" \\\
|
||||
LIBS="-ltirpc" \\\
|
||||
--enable-hdf4 \\\
|
||||
--disable-dap-remote-tests \\\
|
||||
@ -259,7 +260,9 @@ done
|
||||
%{_bindir}/ncdump
|
||||
%{_bindir}/ncgen
|
||||
%{_bindir}/ncgen3
|
||||
%{_libdir}/*.so.15*
|
||||
%{_bindir}/nc4print
|
||||
%{_bindir}/ocprint
|
||||
%{_libdir}/*.so.%{sover}*
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%files devel
|
||||
@ -287,7 +290,9 @@ done
|
||||
%{_libdir}/mpich/bin/ncdump
|
||||
%{_libdir}/mpich/bin/ncgen
|
||||
%{_libdir}/mpich/bin/ncgen3
|
||||
%{_libdir}/mpich/lib/*.so.15*
|
||||
%{_libdir}/mpich/bin/nc4print
|
||||
%{_libdir}/mpich/bin/ocprint
|
||||
%{_libdir}/mpich/lib/*.so.%{sover}*
|
||||
%doc %{_libdir}/mpich/share/man/man1/*.1*
|
||||
|
||||
%files mpich-devel
|
||||
@ -316,7 +321,9 @@ done
|
||||
%{_libdir}/openmpi/bin/ncdump
|
||||
%{_libdir}/openmpi/bin/ncgen
|
||||
%{_libdir}/openmpi/bin/ncgen3
|
||||
%{_libdir}/openmpi/lib/*.so.15*
|
||||
%{_libdir}/openmpi/bin/nc4print
|
||||
%{_libdir}/openmpi/bin/ocprint
|
||||
%{_libdir}/openmpi/lib/*.so.%{sover}*
|
||||
%doc %{_libdir}/openmpi/share/man/man1/*.1*
|
||||
|
||||
%files openmpi-devel
|
||||
@ -339,6 +346,9 @@ done
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Aug 09 2021 Orion Poplawski <orion@nwra.com> - 4.8.0-1
|
||||
- Update to 4.8.0
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.3-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (netcdf-4.7.3.tar.gz) = 5cef5b3499b230b503f87d99cbf5d1ef107550f81489d9be6bb64740692fdd6f967f95f6cb2ab6174d968ee77a08a4e5f3f9d401b2ebc6b482c0e7ded6036f7a
|
||||
SHA512 (netcdf-4.8.0.tar.gz) = 367017338954f1cc2da00a93e7a79f17bbee447a655f98dfa35cac95cd002c40d6122eec9c5670376fad109c2266254ff6e9c82e197b488fcc412790d5b27088
|
||||
|
Loading…
Reference in New Issue
Block a user