From 989f2584fa958c5ba6378fc5237cf13cb81ab9da Mon Sep 17 00:00:00 2001
From: lyn1001 <thistleslyn@163.com>
Date: Tue, 11 Apr 2023 13:58:03 +0800
Subject: [PATCH] Preserve the rpath of the hdf5-openmpi and hdf5-mpich
 subpackages

---
 hdf5.spec | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/hdf5.spec b/hdf5.spec
index 0046492..124fb7d 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -9,7 +9,7 @@
 
 Name: hdf5
 Version: 1.8.20
-Release: 16
+Release: 17
 Summary: A data model, library, and file format for storing and managing data
 License: GPL-2.0-or-later and BSD-3-Clause
 
@@ -38,7 +38,7 @@ BuildRequires: gcc, gcc-c++
 BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time
 BuildRequires: automake libtool
 BuildRequires: openssh-clients
-BuildRequires: libaec-devel chrpath
+BuildRequires: libaec-devel
 
 %description
 HDF5 is a data model, library, and file format for storing and managing data. It supports an unlimited variety of datatypes, and is designed for flexible and efficient I/O and for high volume and complex data. HDF5 is portable and is extensible, allowing applications to evolve in their use of HDF5. The HDF5 Technology suite includes tools and applications for managing, manipulating, viewing, and analyzing data in the HDF5 format.
@@ -223,25 +223,10 @@ cat > ${RPM_BUILD_ROOT}/%{_rpmmacrodir}/macros.hdf5 <<EOF
 %%_hdf5_version %{version}
 EOF
 
-cd  $RPM_BUILD_ROOT/usr
-file `find -type f`| grep -w ELF | awk -F":" '{print $1}' | for i in `xargs`
-do
-  chrpath -d $i
-done
-cd -
-mkdir -p  $RPM_BUILD_ROOT/etc/ld.so.conf.d
-echo "%{_libdir}/mpich/lib" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
-
 %check
 make %{?_smp_mflags} -C build check
 %ldconfig_scriptlets
 
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
 %files
 %license COPYING
 %doc MANIFEST README.txt release_docs/RELEASE.txt
@@ -264,7 +249,6 @@ make %{?_smp_mflags} -C build check
 %{_libdir}/*.so.10*
 %{_libdir}/libhdf5_cpp.so.15*
 %{_libdir}/libhdf5_hl_cpp.so.11*
-%config(noreplace) /etc/ld.so.conf.d/*
 
 %files devel
 %{_bindir}/h5c++*
@@ -356,6 +340,9 @@ make %{?_smp_mflags} -C build check
 %endif
 
 %changelog
+* Tue Apr 11 2023 liyanan <thistleslyn@163.com> - 1.8.20-17
+- Preserve the rpath of the hdf5-openmpi and hdf5-mpich subpackages
+
 * Mon Apr 10 2023 xu_ping <707078654@qq.com> - 1.8.20-16
 - fix some commands failed
 
-- 
Gitee