From 1648adac4b2f98dea17380bde51664c6dc4ffcac78270ea276a6dc6666cd0d13 Mon Sep 17 00:00:00 2001
From: Corot Sebastien <scorot@free.fr>
Date: Tue, 4 Nov 2014 20:12:14 +0000
Subject: [PATCH] Accepting request 259704 from
 home:scorot:branches:network:cluster

- add missing systemd requirements
- add missing rclink

OBS-URL: https://build.opensuse.org/request/show/259704
OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=7
---
 slurm.changes |  6 ++++++
 slurm.spec    | 14 +++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/slurm.changes b/slurm.changes
index 38c3dec..bf60d78 100644
--- a/slurm.changes
+++ b/slurm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Nov  2 22:12:34 UTC 2014 - scorot@free.fr
+
+- add missing systemd requirements 
+- add missing rclink
+
 -------------------------------------------------------------------
 Sun Nov  2 15:04:42 UTC 2014 - scorot@free.fr
 
diff --git a/slurm.spec b/slurm.spec
index 3332c70..2e78456 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -35,7 +35,6 @@ Source1:        slurm.service
 Source2:        slurmdbd.service
 Patch0:         slurm-2.4.4-rpath.patch
 Patch1:         slurm-2.4.4-init.patch
-PreReq:         %insserv_prereq %fillup_prereq
 Requires:       slurm-plugins = %{version}
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -54,7 +53,10 @@ BuildRequires:  postgresql-devel >= 8.0.0
 BuildRequires:  python
 BuildRequires:  readline-devel
 %if %{with_systemd}
+%{?systemd_requires}
 BuildRequires:  systemd
+%else
+PreReq:         %insserv_prereq %fillup_prereq
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -142,7 +144,11 @@ This package contains the SLURM plugin for the Maui or Moab scheduler wiki inter
 Summary:        SLURM database daemon
 Group:          Productivity/Clustering/Computing
 Requires:       slurm-plugins = %{version}
+%if %{with_systemd}
+%{?systemd_requires}
+%else
 PreReq:         %insserv_prereq %fillup_prereq
+%endif
 
 %description slurmdbd
 The SLURM database daemon provides accounting of jobs in a database.
@@ -220,6 +226,8 @@ make install-contrib DESTDIR=$RPM_BUILD_ROOT
 %if %{with_systemd}
 mkdir -p %{buildroot}%{_unitdir}
 install -p -m644 %{S:1} %{S:2} %{buildroot}%{_unitdir}
+ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcslurm
+ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcslurmdbd
 %else
 install -D -m755 etc/init.d.slurm    $RPM_BUILD_ROOT%{_initrddir}/slurm
 install -D -m755 etc/init.d.slurmdbd $RPM_BUILD_ROOT%{_initrddir}/slurmdbd
@@ -385,8 +393,8 @@ rm doc/html/shtml2html.py doc/html/Makefile*
 %config %{_unitdir}/slurm.service
 %else
 %{_initrddir}/slurm
-%{_sbindir}/rcslurm
 %endif
+%{_sbindir}/rcslurm
 
 %files -n %{libslurm}
 %defattr(-,root,root)
@@ -443,8 +451,8 @@ rm doc/html/shtml2html.py doc/html/Makefile*
 %config %{_unitdir}/slurmdbd.service
 %else
 %{_initrddir}/slurmdbd
-%{_sbindir}/rcslurmdbd
 %endif
+%{_sbindir}/rcslurmdbd
 
 %files plugins
 %defattr(-,root,root)