From 2dc1925cbd8b9fe3d3a54db379db854b2883746d7bd19f880a15d0d1766bc92b Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 10 Nov 2017 14:19:18 +0000 Subject: [PATCH] Accepting request 540570 from home:eeich:branches:network:cluster - Package so-versioned libs separate from non-so-versioned. This way, the non-so-versioned libs can remain installed without conflict. OBS-URL: https://build.opensuse.org/request/show/540570 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=31 --- slurm.changes | 7 +++++++ slurm.spec | 28 +++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/slurm.changes b/slurm.changes index f923e95..bcb1c16 100644 --- a/slurm.changes +++ b/slurm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Nov 10 13:52:30 UTC 2017 - eich@suse.com + +- Package so-versioned libs separate from non-so-versioned. + This way, the non-so-versioned libs can remain installed + without conflict. + ------------------------------------------------------------------- Wed Nov 1 16:15:04 UTC 2017 - eich@suse.com diff --git a/slurm.spec b/slurm.spec index b2a0304..9986cda 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,8 +16,8 @@ # -# Check file META in sources: update libslurm version to (API_CURRENT - API_AGE) -%define libslurm libslurm31 +# Check file META in sources: update so_version to (API_CURRENT - API_AGE) +%define so_version 31 %define ver 17.02.9 # For anything newer than Leap 42.1 and SLE-12-SP1 build compatible to OpenHPC. @@ -51,6 +51,8 @@ %define slurm_g root %endif +%define libslurm libslurm%{so_version} + Name: slurm Version: %{ver} Release: 0 @@ -143,10 +145,20 @@ This package contains the library needed to run programs dynamically linked with SLURM. +%package -n lib%{name} +Summary: Libraries for SLURM +Group: System/Libraries +Requires: %{libslurm} = %version + +%description -n lib%{name} +This package contains the library needed to run programs dynamically linked +with SLURM. + + %package devel Summary: Development package for SLURM Group: Development/Libraries/C and C++ -Requires: %{libslurm} = %{version} +Requires: lib%{name} = %{version} Requires: slurm = %{version} %description devel @@ -483,9 +495,11 @@ exit 0 %endif %post -n %{libslurm} -p /sbin/ldconfig - %postun -n %{libslurm} -p /sbin/ldconfig +%post -n lib%{name} -p /sbin/ldconfig +%postun -n lib%{name} -p /sbin/ldconfig + %files %defattr(-,root,root) %doc AUTHORS NEWS RELEASE_NOTES DISCLAIMER COPYING @@ -592,7 +606,11 @@ exit 0 %files -n %{libslurm} %defattr(-,root,root) -%{_libdir}/*.so.* +%{_libdir}/*.so.%{so_version}* + +%files -n lib%{name} +%defattr(-,root,root) +%{_libdir}/*.so.0* %files devel %defattr(-,root,root)