From cada7fd327c3f94cb7e8e225a80aa979322c25b1bd54ef9ffb3971031408b76c Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Wed, 20 Oct 2021 06:46:59 +0000 Subject: [PATCH] Accepting request 926462 from home:NMoreyChaisemartin:branches:science:HPC - Move rpm macros to %_rpmmacrodir (bsc#1191386) OBS-URL: https://build.opensuse.org/request/show/926462 OBS-URL: https://build.opensuse.org/package/show/science:HPC/mvapich2?expand=0&rev=85 --- mvapich2.changes | 5 +++++ mvapich2.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mvapich2.changes b/mvapich2.changes index 1411fb1..d38314e 100644 --- a/mvapich2.changes +++ b/mvapich2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 19 15:20:53 UTC 2021 - Nicolas Morey-Chaisemartin + +- Move rpm macros to %_rpmmacrodir (bsc#1191386) + ------------------------------------------------------------------- Tue Sep 28 07:20:18 UTC 2021 - Nicolas Morey-Chaisemartin diff --git a/mvapich2.spec b/mvapich2.spec index 44b876c..2add0b0 100644 --- a/mvapich2.spec +++ b/mvapich2.spec @@ -494,8 +494,8 @@ set ModulesVersion "%{version}" EOF %else # with hpc -install -d -m 755 %{buildroot}%{_sysconfdir}/rpm -cp %{S:3} %{buildroot}%{_sysconfdir}/rpm +install -d -m 755 %{buildroot}%{_rpmmacrodir} +cp %{S:3} %{buildroot}%{_rpmmacrodir} %hpc_write_modules_files #%%Module1.0##################################################################### @@ -611,7 +611,7 @@ fi %if %{with hpc} %files macros-devel %defattr(-,root,root) -%config %{_sysconfdir}/rpm/macros.hpc-mvapich2 +%config %{_rpmmacrodir}/macros.hpc-mvapich2 %endif # with hpc %endif # !testsuite