diff --git a/netcdf-4.8.1.tar.gz b/netcdf-4.9.2.tar.gz similarity index 66% rename from netcdf-4.8.1.tar.gz rename to netcdf-4.9.2.tar.gz index 2480124f6854795d4941d300d98d82476e0a1a0d..96ec54122624c213a9968c9b07d04d2182e95aea 100644 Binary files a/netcdf-4.8.1.tar.gz and b/netcdf-4.9.2.tar.gz differ diff --git a/netcdf.spec b/netcdf.spec index ed236909eb37b508771365fbc985d204610c7054..be19785d47a87259698e8b6d1b50de14912b02c3 100644 --- a/netcdf.spec +++ b/netcdf.spec @@ -1,7 +1,7 @@ %global sover 19 Name: netcdf -Version: 4.8.1 -Release: 5 +Version: 4.9.2 +Release: 1 Summary: Libraries for the Unidata network Common Data Form License: BSD-3-Clause @@ -19,6 +19,10 @@ BuildRequires: gawk BuildRequires: libcurl-devel BuildRequires: m4 BuildRequires: zlib-devel +BuildRequires: libxml2-devel +BuildRequires: bzip2-devel +BuildRequires: libzip-devel +BuildRequires: libzstd-devel %ifarch %{valgrind_arches} BuildRequires: valgrind %endif @@ -157,7 +161,9 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" mkdir build pushd build ln -s ../configure . -%configure %{configure_opts} +%configure %{configure_opts} \ + --with-plugin-dir=%{_libdir}/hdf5/plugin +sed -e 's|CC="\(.*g..\)"|CC="\1 -Wl,--as-needed"|' -i libtool %make_build popd @@ -178,7 +184,9 @@ do --includedir=%{_includedir}/$mpi-%{_arch} \ --datarootdir=%{_libdir}/$mpi/share \ --mandir=%{_libdir}/$mpi/share/man \ + --with-plugin-dir=%{_libdir}/$mpi/hdf5/plugin \ --enable-parallel-tests + sed -e 's|CC="\(.*g..\)"|CC="\1 -Wl,--as-needed"|' -i libtool %make_build module purge popd @@ -187,24 +195,19 @@ done %install make -C build install DESTDIR=${RPM_BUILD_ROOT} -/bin/rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la -chrpath --delete ${RPM_BUILD_ROOT}/%{_bindir}/nc{copy,dump,gen,gen3} /bin/rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir %if %{with_mpich} for mpi in %{mpi_list} do module load mpi/$mpi-%{_arch} make -C $mpi install DESTDIR=${RPM_BUILD_ROOT} - rm $RPM_BUILD_ROOT/%{_libdir}/$mpi/lib/*.la - chrpath --delete ${RPM_BUILD_ROOT}/%{_libdir}/$mpi/bin/nc{copy,dump,gen,gen3} module purge done %endif +find $RPM_BUILD_ROOT/%{_libdir} -name \*.la -delete -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/lib/libnetcdf.so.19.2.2 +chrpath -d %{buildroot}/%{_libdir}/openmpi/lib/libnetcdf.so.19.2.2 chrpath -d %{buildroot}/%{_libdir}/mpich/bin/nc4print chrpath -d %{buildroot}/%{_libdir}/openmpi/bin/nc4print chrpath -d %{buildroot}/%{_libdir}/mpich/bin/ocprint @@ -225,6 +228,7 @@ make %{?_smp_mflags} -C build check %{_bindir}/nc4print %{_bindir}/ocprint %{_libdir}/*.so.%{sover}* +%{_libdir}/hdf5/plugin/* %{_mandir}/man1/* %files devel @@ -236,9 +240,9 @@ make %{?_smp_mflags} -C build check %{_includedir}/netcdf_filter.h %{_includedir}/netcdf_meta.h %{_includedir}/netcdf_mem.h -%{_includedir}/mpich-%{_arch}/netcdf_filter_build.h -%{_includedir}/openmpi-%{_arch}/netcdf_filter_build.h %{_includedir}/netcdf_filter_build.h +%{_includedir}/netcdf_filter_hdf5_build.h +%{_includedir}/netcdf_json.h %{_libdir}/libnetcdf.settings %{_libdir}/*.so %{_libdir}/pkgconfig/netcdf.pc @@ -258,6 +262,7 @@ make %{?_smp_mflags} -C build check %{_libdir}/mpich/bin/nc4print %{_libdir}/mpich/bin/ocprint %{_libdir}/mpich/lib/*.so.%{sover}* +%{_libdir}/mpich/hdf5/plugin/* %doc %{_libdir}/mpich/share/man/man1/*.1* %files mpich-devel @@ -269,6 +274,9 @@ make %{?_smp_mflags} -C build check %{_includedir}/mpich-%{_arch}/netcdf_meta.h %{_includedir}/mpich-%{_arch}/netcdf_mem.h %{_includedir}/mpich-%{_arch}/netcdf_par.h +%{_includedir}/mpich-%{_arch}/netcdf_filter_build.h +%{_includedir}/mpich-%{_arch}/netcdf_filter_hdf5_build.h +%{_includedir}/mpich-%{_arch}/netcdf_json.h %{_libdir}/mpich/lib/libnetcdf.settings %{_libdir}/mpich/lib/*.so %{_libdir}/mpich/lib/pkgconfig/%{name}.pc @@ -288,6 +296,7 @@ make %{?_smp_mflags} -C build check %{_libdir}/openmpi/bin/ncgen3 %{_libdir}/openmpi/bin/nc4print %{_libdir}/openmpi/bin/ocprint +%{_libdir}/openmpi/hdf5/plugin/* %{_libdir}/openmpi/lib/*.so.%{sover}* %doc %{_libdir}/openmpi/share/man/man1/*.1* @@ -300,6 +309,9 @@ make %{?_smp_mflags} -C build check %{_includedir}/openmpi-%{_arch}/netcdf_meta.h %{_includedir}/openmpi-%{_arch}/netcdf_mem.h %{_includedir}/openmpi-%{_arch}/netcdf_par.h +%{_includedir}/openmpi-%{_arch}/netcdf_filter_build.h +%{_includedir}/openmpi-%{_arch}/netcdf_filter_hdf5_build.h +%{_includedir}/openmpi-%{_arch}/netcdf_json.h %{_libdir}/openmpi/lib/libnetcdf.settings %{_libdir}/openmpi/lib/*.so %{_libdir}/openmpi/lib/pkgconfig/%{name}.pc @@ -310,6 +322,15 @@ make %{?_smp_mflags} -C build check %endif %changelog +* Thu Dec 26 2024 yaoxin <1024769339@qq.com> - 4.9.2-1 +- Update to 4.9.2: + * Update nc-config to remove inclusion from automatically-detected nf-config and + ncxx-config files, as the wrong files could be included in the output. + * Update H5FDhttp.[ch] to work with HDF5 version 1.13.2 and later. + * Update DAP code to enable CURLOPT_ACCEPT_ENCODING by default. + * Fix byterange failures for certain URLs. + * Fix 'make distcheck' error in run_interop.sh. + * Sun Jun 09 2024 wangqiang - 4.8.1-5 - DESC: Fix unpackaged files error on loongarch64