Compare commits
3 Commits
2c669adb34
...
a9504649d7
Author | SHA1 | Date | |
---|---|---|---|
|
a9504649d7 | ||
|
08b2acc08b | ||
|
b8e22189c3 |
1
.gitignore
vendored
1
.gitignore
vendored
@ -20,3 +20,4 @@ netcdf-4.1.1.tar.gz
|
||||
/netcdf-4.7.0.tar.gz
|
||||
/netcdf-4.7.3.tar.gz
|
||||
/netcdf-4.8.0.tar.gz
|
||||
/netcdf-4.8.1.tar.gz
|
||||
|
@ -1,12 +0,0 @@
|
||||
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
|
@ -1,15 +0,0 @@
|
||||
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. */
|
||||
|
25
netcdf.spec
25
netcdf.spec
@ -1,17 +1,13 @@
|
||||
%global sover 19
|
||||
|
||||
Name: netcdf
|
||||
Version: 4.8.0
|
||||
Release: 1%{?dist}
|
||||
Version: 4.8.1
|
||||
Release: 3%{?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
|
||||
@ -164,7 +160,6 @@ NetCDF parallel openmpi static libraries
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{name}-c-%{version}
|
||||
autoreconf -fiv
|
||||
|
||||
|
||||
%build
|
||||
@ -232,10 +227,10 @@ done
|
||||
|
||||
%check
|
||||
# Set to 1 to fail if tests fail
|
||||
%ifarch armv7hl %{ix86} s390x
|
||||
%ifarch %{ix86} s390x
|
||||
# tst_filter fails on s390x
|
||||
# https://github.com/Unidata/netcdf-c/issues/1338
|
||||
# armv7hl/i686 - Testing parallel I/O with zlib compression...malloc(): invalid size (unsorted)
|
||||
# i686 - Testing parallel I/O with zlib compression...malloc(): invalid size (unsorted)
|
||||
# https://github.com/Unidata/netcdf-c/issues/1685
|
||||
fail=0
|
||||
%else
|
||||
@ -277,6 +272,7 @@ done
|
||||
%{_includedir}/netcdf_aux.h
|
||||
%{_includedir}/netcdf_dispatch.h
|
||||
%{_includedir}/netcdf_filter.h
|
||||
%{_includedir}/netcdf_filter_build.h
|
||||
%{_includedir}/netcdf_meta.h
|
||||
%{_includedir}/netcdf_mem.h
|
||||
%{_libdir}/libnetcdf.settings
|
||||
@ -306,6 +302,7 @@ done
|
||||
%{_includedir}/mpich-%{_arch}/netcdf_aux.h
|
||||
%{_includedir}/mpich-%{_arch}/netcdf_dispatch.h
|
||||
%{_includedir}/mpich-%{_arch}/netcdf_filter.h
|
||||
%{_includedir}/mpich-%{_arch}/netcdf_filter_build.h
|
||||
%{_includedir}/mpich-%{_arch}/netcdf_meta.h
|
||||
%{_includedir}/mpich-%{_arch}/netcdf_mem.h
|
||||
%{_includedir}/mpich-%{_arch}/netcdf_par.h
|
||||
@ -337,6 +334,7 @@ done
|
||||
%{_includedir}/openmpi-%{_arch}/netcdf_aux.h
|
||||
%{_includedir}/openmpi-%{_arch}/netcdf_dispatch.h
|
||||
%{_includedir}/openmpi-%{_arch}/netcdf_filter.h
|
||||
%{_includedir}/openmpi-%{_arch}/netcdf_filter_build.h
|
||||
%{_includedir}/openmpi-%{_arch}/netcdf_meta.h
|
||||
%{_includedir}/openmpi-%{_arch}/netcdf_mem.h
|
||||
%{_includedir}/openmpi-%{_arch}/netcdf_par.h
|
||||
@ -351,6 +349,15 @@ done
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Sun Nov 21 2021 Orion Poplawski <orion@nwra.com> - 4.8.1-2
|
||||
- Rebuild for hdf5 1.12.1
|
||||
|
||||
* Tue Aug 24 2021 Orion Poplawski <orion@nwra.com> - 4.8.1-1
|
||||
- Update to 4.8.1
|
||||
|
||||
* Mon Aug 09 2021 Orion Poplawski <orion@nwra.com> - 4.8.0-1
|
||||
- Update to 4.8.0
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (netcdf-4.8.0.tar.gz) = 367017338954f1cc2da00a93e7a79f17bbee447a655f98dfa35cac95cd002c40d6122eec9c5670376fad109c2266254ff6e9c82e197b488fcc412790d5b27088
|
||||
SHA512 (netcdf-4.8.1.tar.gz) = c97207867abf10d414abf34624268710f5b812c26c38f97e73afe00558b3f07917331fbc7fdb9e70b09813acf15a9a09bae2c432a3266ce10a791b9472f87a42
|
||||
|
Loading…
Reference in New Issue
Block a user