SHA256
1
0
forked from pool/slurm

Accepting request 542024 from home:eeich:branches:network:cluster

- Package so-versioned libs separately. sibslurm is expected
  to change more frequently and thus is packaged separately
  from libpmi.

OBS-URL: https://build.opensuse.org/request/show/542024
OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=32
This commit is contained in:
Egbert Eich 2017-11-15 12:49:05 +00:00 committed by Git OBS Bridge
parent 2dc1925cbd
commit 8ae70e8d08
2 changed files with 12 additions and 9 deletions

View File

@ -1,9 +1,9 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 10 13:52:30 UTC 2017 - eich@suse.com Fri Nov 10 13:52:30 UTC 2017 - eich@suse.com
- Package so-versioned libs separate from non-so-versioned. - Package so-versioned libs separately. sibslurm is expected
This way, the non-so-versioned libs can remain installed to change more frequently and thus is packaged separately
without conflict. from libpmi.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 1 16:15:04 UTC 2017 - eich@suse.com Wed Nov 1 16:15:04 UTC 2017 - eich@suse.com

View File

@ -19,6 +19,8 @@
# Check file META in sources: update so_version to (API_CURRENT - API_AGE) # Check file META in sources: update so_version to (API_CURRENT - API_AGE)
%define so_version 31 %define so_version 31
%define ver 17.02.9 %define ver 17.02.9
# so-version is 0 and seems to be stable
%define pmi_so 0
# For anything newer than Leap 42.1 and SLE-12-SP1 build compatible to OpenHPC. # For anything newer than Leap 42.1 and SLE-12-SP1 build compatible to OpenHPC.
%if 0%{suse_version} > 1320 || 0%{?sle_version} >= 120200 %if 0%{suse_version} > 1320 || 0%{?sle_version} >= 120200
@ -145,12 +147,12 @@ This package contains the library needed to run programs dynamically linked
with SLURM. with SLURM.
%package -n lib%{name} %package -n libpmi-%{name}%{pmi_so}
Summary: Libraries for SLURM Summary: Libraries for SLURM
Group: System/Libraries Group: System/Libraries
Requires: %{libslurm} = %version Requires: %{libslurm} = %version
%description -n lib%{name} %description -n libpmi-%{name}%{pmi_so}
This package contains the library needed to run programs dynamically linked This package contains the library needed to run programs dynamically linked
with SLURM. with SLURM.
@ -158,7 +160,8 @@ with SLURM.
%package devel %package devel
Summary: Development package for SLURM Summary: Development package for SLURM
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: lib%{name} = %{version} Requires: %{libslurm} = %{version}
Requires: libpmi-%{name}%{pmi_so} = %{version}
Requires: slurm = %{version} Requires: slurm = %{version}
%description devel %description devel
@ -497,8 +500,8 @@ exit 0
%post -n %{libslurm} -p /sbin/ldconfig %post -n %{libslurm} -p /sbin/ldconfig
%postun -n %{libslurm} -p /sbin/ldconfig %postun -n %{libslurm} -p /sbin/ldconfig
%post -n lib%{name} -p /sbin/ldconfig %post -n libpmi-%{name}%{pmi_so} -p /sbin/ldconfig
%postun -n lib%{name} -p /sbin/ldconfig %postun -n libpmi-%{name}%{pmi_so} -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
@ -608,7 +611,7 @@ exit 0
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/*.so.%{so_version}* %{_libdir}/*.so.%{so_version}*
%files -n lib%{name} %files -n libpmi-%{name}%{pmi_so}
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/*.so.0* %{_libdir}/*.so.0*