From e5be8f4bf8aa245570869e8900a7db0e53d6193d421de8c53257b3d035fdcc1d Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Wed, 19 Feb 2020 21:31:15 +0000 Subject: [PATCH] - Add explicit version dependency to libpmix as well. 'slurm-devel' has a tight version dependency on libpmix - allowing multiple libpmix versions in one package repository is therefore essential. OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=135 --- slurm.changes | 8 ++++++++ slurm.spec | 12 +++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/slurm.changes b/slurm.changes index 4574b98..0370944 100644 --- a/slurm.changes +++ b/slurm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Feb 19 21:27:00 UTC 2020 - Egbert Eich + +- Add explicit version dependency to libpmix as well. + 'slurm-devel' has a tight version dependency on libpmix - + allowing multiple libpmix versions in one package repository + is therefore essential. + ------------------------------------------------------------------- Thu Feb 13 22:34:48 UTC 2020 - Egbert Eich diff --git a/slurm.spec b/slurm.spec index e431758..257c7c3 100644 --- a/slurm.spec +++ b/slurm.spec @@ -245,11 +245,13 @@ This package contains the library needed to run programs dynamically linked with SLURM. -%package -n libpmi%{pmi_so} +%package -n libpmi%{pmi_so}%{?upgrade:%{_ver}} Summary: SLURM PMI Library Group: System/Libraries +%{?upgrade:Provides: libpmi%{pmi_so} = %{version}} +%{?upgrade:Conflicts: libpmi%{pmi_so}} -%description -n libpmi%{pmi_so} +%description -n libpmi%{pmi_so}%{?upgrade:%{_ver}} This package contains the library needed to run programs dynamically linked with SLURM. @@ -824,8 +826,8 @@ exit 0 %post -n %{libslurm} -p /sbin/ldconfig %postun -n %{libslurm} -p /sbin/ldconfig -%post -n libpmi%{pmi_so} -p /sbin/ldconfig -%postun -n libpmi%{pmi_so} -p /sbin/ldconfig +%post -n libpmi%{pmi_so}%{?upgrade:%{_ver}} -p /sbin/ldconfig +%postun -n libpmi%{pmi_so}%{?upgrade:%{_ver}} -p /sbin/ldconfig %post -n libnss_%{pname}%{nss_so} -p /sbin/ldconfig %postun -n libnss_%{pname}%{nss_so} -p /sbin/ldconfig @@ -965,7 +967,7 @@ exit 0 %{?comp_at} %{_libdir}/libslurm*.so.%{so_version}* -%files -n libpmi%{pmi_so} +%files -n libpmi%{pmi_so}%{?upgrade:%{_ver}} %{?comp_at} %{_libdir}/libpmi*.so.%{pmi_so}*