diff --git a/netcdf-4.7.3.tar.gz b/netcdf-4.8.1.tar.gz similarity index 66% rename from netcdf-4.7.3.tar.gz rename to netcdf-4.8.1.tar.gz index 88e093f..2480124 100644 Binary files a/netcdf-4.7.3.tar.gz and b/netcdf-4.8.1.tar.gz differ diff --git a/netcdf.spec b/netcdf.spec index 6481416..a9c1815 100644 --- a/netcdf.spec +++ b/netcdf.spec @@ -1,6 +1,7 @@ +%global sover 19 Name: netcdf -Version: 4.7.3 -Release: 3 +Version: 4.8.1 +Release: 1 Summary: Libraries for the Unidata network Common Data Form License: BSD-3-Clause @@ -196,12 +197,21 @@ do module load mpi/$mpi-%{_arch} make -C $mpi install DESTDIR=${RPM_BUILD_ROOT} rm $RPM_BUILD_ROOT/%{_libdir}/$mpi/lib/*.la - rm $RPM_BUILD_ROOT/%{_libdir}/$mpi/lib/*.so.15* chrpath --delete ${RPM_BUILD_ROOT}/%{_libdir}/$mpi/bin/nc{copy,dump,gen,gen3} module purge done %endif +chrpath -d %{buildroot}/%{_libdir}/openmpi/lib/libh5bzip2.so +chrpath -d %{buildroot}/%{_libdir}/mpich/lib/libh5bzip2.so +chrpath -d %{buildroot}/%{_libdir}/mpich/lib/libnetcdf.so.19.0.1 +chrpath -d %{buildroot}/%{_libdir}/openmpi/lib/libnetcdf.so.19.0.1 +chrpath -d %{buildroot}/%{_libdir}/mpich/bin/nc4print +chrpath -d %{buildroot}/%{_libdir}/openmpi/bin/nc4print +chrpath -d %{buildroot}/%{_libdir}/mpich/bin/ocprint +chrpath -d %{buildroot}/%{_libdir}/openmpi/bin/ocprint + + %check make %{?_smp_mflags} -C build check %ldconfig_scriptlets @@ -213,7 +223,9 @@ make %{?_smp_mflags} -C build check %{_bindir}/ncdump %{_bindir}/ncgen %{_bindir}/ncgen3 -%{_libdir}/*.so.15* +%{_bindir}/nc4print +%{_bindir}/ocprint +%{_libdir}/*.so.%{sover}* %{_mandir}/man1/* %files devel @@ -225,6 +237,15 @@ make %{?_smp_mflags} -C build check %{_includedir}/netcdf_filter.h %{_includedir}/netcdf_meta.h %{_includedir}/netcdf_mem.h +%ifarch x86_64 +%{_includedir}/mpich-x86_64/netcdf_filter_build.h +%{_includedir}/openmpi-x86_64/netcdf_filter_build.h +%endif +%ifarch aarch64 +%{_includedir}/mpich-aarch64/netcdf_filter_build.h +%{_includedir}/openmpi-aarch64/netcdf_filter_build.h +%endif +%{_includedir}/netcdf_filter_build.h %{_libdir}/libnetcdf.settings %{_libdir}/*.so %{_libdir}/pkgconfig/netcdf.pc @@ -241,7 +262,9 @@ make %{?_smp_mflags} -C build check %{_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 @@ -270,7 +293,9 @@ make %{?_smp_mflags} -C build check %{_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 @@ -292,6 +317,9 @@ make %{?_smp_mflags} -C build check %endif %changelog +* Wed Mar 29 2023 yaoxin - 4.8.1-1 +- Update to 4.8.1 + * Fri Aug 12 2022 zhangjun - 4.7.3-3 - Upgrade license to BSD-3-Clause