From 968252559ba253a14e02a2d0b2edf8c4b4de256f Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Wed, 13 Nov 2024 22:51:58 +0800 Subject: [PATCH] build: adopt to new cmake macro chore: migrated to SPDX license chore: drop useless setup macro, cause it duplicates with autosetup chore: drop useless ldconfig_scriptlets, it has been done through glibc filetriggers since openeuler 1.0 (cherry picked from commit 8089b39ef3cde744f928f49c76318b33edec16a2) --- rdma-core.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/rdma-core.spec b/rdma-core.spec index 21a690e..8eb9151 100644 --- a/rdma-core.spec +++ b/rdma-core.spec @@ -1,8 +1,8 @@ Name: rdma-core Version: 50.0 -Release: 13 +Release: 14 Summary: RDMA core userspace libraries and daemons -License: GPLv2 or BSD +License: GPL-2.0-only OR BSD-2-Clause AND BSD-3-Clause Url: https://github.com/linux-rdma/rdma-core Source: https://github.com/linux-rdma/rdma-core/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -255,7 +255,6 @@ Obsoletes: infiniband-diags-help < %{version}-%{release} Man pages and other related documents for %{name}. %prep -%setup %autosetup -v -p1 %build @@ -290,7 +289,7 @@ Man pages and other related documents for %{name}. -DPYTHON_EXECUTABLE:PATH=%{__python3} \ -DCMAKE_INSTALL_PYTHON_ARCH_LIB:PATH=%{python3_sitearch} \ -DNO_PYVERBS=0 -%make_jobs +%cmake_build %install %cmake_install @@ -317,12 +316,6 @@ install -D -m 0644 ibacm_opts.cfg %{buildroot}%{_sysconfdir}/rdma/ rm -rf %{buildroot}/%{_initrddir}/ rm -f %{buildroot}/%{_sbindir}/srp_daemon.sh -%ldconfig_scriptlets -n libibverbs - -%ldconfig_scriptlets -n libibumad - -%ldconfig_scriptlets -n librdmacm - %post if [ -x /sbin/udevadm ];then /sbin/udevadm trigger --subsystem-match=infiniband --action=change || true @@ -628,6 +621,13 @@ fi %doc %{_docdir}/%{name}-%{version}/70-persistent-ipoib.rules %changelog +* Fri Nov 08 2024 Funda Wang - 50.0-14 +- adopt to new cmake macro +- migrated to SPDX license +- drop useless setup macro, cause it duplicates with autosetup +- drop useless ldconfig_scriptlets, it has been done through glibc's + filetriggers since openeuler 1.0 + * Sat Aug 31 2024 Li Fuyan - 50.0-13 - Type: requirement - ID: NA -- Gitee