From f02d0e90d1e9680cc31e35f42006070d7382d692 Mon Sep 17 00:00:00 2001
From: Dennis Klein <d.klein@gsi.de>
Date: Mon, 15 Jan 2024 19:44:03 +0100
Subject: [PATCH] Update to 2.0.0
---
slurm-singularity-exec.spec | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/slurm-singularity-exec.spec b/slurm-singularity-exec.spec
index 7014c2c..dec649a 100644
--- a/slurm-singularity-exec.spec
+++ b/slurm-singularity-exec.spec
@@ -2,17 +2,17 @@
%global name_tag %{name}-v%{version}
Name: slurm-singularity-exec
-Version: 1.0.0
+Version: 2.0.0
Release: %autorelease
Summary: Slurm SPANK plugin to start Singularity/Apptainer containers
License: GPLv3
Source0: https://git.gsi.de/SDE/%{name}/-/archive/%{tag}/%{name_tag}.tar.bz2
+BuildRequires: cmake
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: libstdc++-static
-BuildRequires: make
BuildRequires: slurm-devel
Requires: apptainer
@@ -29,23 +29,16 @@ the cluster administrator.
%autosetup -n %{name_tag}
%build
-make
-
-%clean
-rm -rf %{buildroot}
+%cmake -D INSTALL_PLUGSTACK_CONF=ON
+%cmake_build
%install
-install -p -m 0644 -D singularity-exec.so \
- %{buildroot}/%{_libdir}/slurm/singularity-exec.so
-install -p -m 0644 -D slurm-singularity-wrapper.sh \
- %{buildroot}/%{_libexecdir}/slurm-singularity-wrapper.sh
-install -p -m 0644 -D singularity-exec.conf \
- %{buildroot}/%{_docdir}/%{name}/singularity-exec.conf
+%cmake_install
%files
-%{_libdir}/slurm/singularity-exec.so
+%{_libexecdir}/slurm-singularity-exec.so
%{_libexecdir}/slurm-singularity-wrapper.sh
-%{_docdir}/%{name}/singularity-exec.conf
+%config(noreplace) %{_sysconfdir}/slurm/plugstack.conf.d/singularity-exec.conf
%license LICENSE
%doc README.md
--
GitLab