diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..c9a618551d7d788cde5f4326178966a3917277e9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.gz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..0afe05b90446da071344dd5c5953f48112369bce --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/hdf diff --git a/hdf.spec b/hdf.spec index 2ae8d0fd4fc0c14e150c1222b33ee98621bf4bbc..2009db772b2f9b676194ace3595e11f6cda66445 100644 --- a/hdf.spec +++ b/hdf.spec @@ -1,6 +1,6 @@ Name: hdf Version: 4.3.0 -Release: 1 +Release: 2 Summary: A general purpose library and file format for storing scientific data License: IJG URL: https://portal.hdfgroup.org/ @@ -20,6 +20,7 @@ BuildRequires: javapackages-tools BuildRequires: hamcrest BuildRequires: junit BuildRequires: slf4j +Conflicts: hdf-devel < 4.3.0-2 %description HDF is a general purpose library and file format for storing scientific data. @@ -34,9 +35,9 @@ grids. You can also mix and match them in HDF files according to your needs. Summary: HDF development files Provides: %{name}-static = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: libjpeg-devel%{?_isa} -Requires: libtirpc-devel%{?_isa} -Requires: zlib-devel%{?_isa} +Requires: libjpeg-devel +Requires: libtirpc-devel +Requires: zlib-devel %description devel HDF development headers and libraries. @@ -50,9 +51,8 @@ Obsoletes: jhdf < 3.3.1-2 HDF4 java library %prep -%setup -q -n hdf4-hdf%{version} -%patch -P 1 -p1 -b .build - +%autosetup -p1 -n hdf4-hdf%{version} + find . -name "*.jar" -delete ln -s $(build-classpath hamcrest/core) java/lib/hamcrest-core.jar ln -s $(build-classpath junit) java/lib/junit.jar @@ -77,7 +77,7 @@ rm config/*linux-gnu # TODO: upstream fix # Shared libraries disabled: libmfhdf.so is not correctly compiled # for missing link to libdf.so - + export CFLAGS="%{optflags} -I%{_usr}/include/tirpc" export LIBS="-ltirpc" %global _configure ../configure @@ -91,7 +91,6 @@ cd build-shared %make_build cd - - mkdir build-static cd build-static export FCFLAGS="%{build_fflags} -fallow-argument-mismatch" @@ -144,17 +143,22 @@ make -j1 -C build-static check %license COPYING %doc README.md release_notes/*.txt %{_bindir}/* +%{_libdir}/*.so.* %files devel -%{_includedir}/%{name}/ -%{_libdir}/* -%exclude %{_libdir}/%{name}/libhdf_java.so - +%{_includedir}/%{name} +%{_libdir}/*.a +%{_libdir}/*.so +%{_libdir}/*.settings + %files -n java-hdf %{_jnidir}/hdf.jar %{_libdir}/%{name}/libhdf_java.so %changelog +* Mon Sep 08 2025 Funda Wang - 4.3.0-2 +- move *.so.* into main package + * Tue Nov 12 2024 xu_ping <707078654@qq.com> - 4.3.0-1 - Upgrade version to 4.3.0 - Changed minimum CMake version to 3.18 diff --git a/hdf4.3.0.tar.gz b/hdf4.3.0.tar.gz index 9540646e913ad8fe82f7676f3d26b9d246365184..9b229ed69c337e41bb4fab7dca62a500852e724c 100644 Binary files a/hdf4.3.0.tar.gz and b/hdf4.3.0.tar.gz differ