rpm/slurm
SHA256
1
0
Fork 0
forked from pool/slurm
Code Pull Requests Activity

Accepting request 259704 from home:scorot:branches:network:cluster

Browse Source 
- 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
This commit is contained in:
Corot Sebastien 2014-11-04 20:12:14 +00:00 committed by Git OBS Bridge
parent ee0741e9cc
commit 1648adac4b
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slurm.changes
View File

@ -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 Sun Nov 2 15:04:42 UTC 2014 - scorot@free.fr

14
slurm.spec
View File

@ -35,7 +35,6 @@ Source1: slurm.service
Source2: slurmdbd.service Source2: slurmdbd.service
Patch0: slurm-2.4.4-rpath.patch Patch0: slurm-2.4.4-rpath.patch
Patch1: slurm-2.4.4-init.patch Patch1: slurm-2.4.4-init.patch
PreReq: %insserv_prereq %fillup_prereq
Requires: slurm-plugins = %{version} Requires: slurm-plugins = %{version}
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -54,7 +53,10 @@ BuildRequires: postgresql-devel >= 8.0.0
BuildRequires: python BuildRequires: python
BuildRequires: readline-devel BuildRequires: readline-devel
%if %{with_systemd} %if %{with_systemd}
%{?systemd_requires}
BuildRequires: systemd BuildRequires: systemd
%else
PreReq: %insserv_prereq %fillup_prereq
%endif %endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build 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 Summary: SLURM database daemon
Group: Productivity/Clustering/Computing Group: Productivity/Clustering/Computing
Requires: slurm-plugins = %{version} Requires: slurm-plugins = %{version}
%if %{with_systemd}
%{?systemd_requires}
%else
PreReq: %insserv_prereq %fillup_prereq PreReq: %insserv_prereq %fillup_prereq
%endif
%description slurmdbd %description slurmdbd
The SLURM database daemon provides accounting of jobs in a database. 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} %if %{with_systemd}
mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_unitdir}
install -p -m644 %{S:1} %{S:2} %{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 %else
install -D -m755 etc/init.d.slurm $RPM_BUILD_ROOT%{_initrddir}/slurm install -D -m755 etc/init.d.slurm $RPM_BUILD_ROOT%{_initrddir}/slurm
install -D -m755 etc/init.d.slurmdbd $RPM_BUILD_ROOT%{_initrddir}/slurmdbd 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 %config %{_unitdir}/slurm.service
%else %else
%{_initrddir}/slurm %{_initrddir}/slurm
%{_sbindir}/rcslurm
%endif %endif
%{_sbindir}/rcslurm
%files -n %{libslurm} %files -n %{libslurm}
%defattr(-,root,root) %defattr(-,root,root)
@ -443,8 +451,8 @@ rm doc/html/shtml2html.py doc/html/Makefile*
%config %{_unitdir}/slurmdbd.service %config %{_unitdir}/slurmdbd.service
%else %else
%{_initrddir}/slurmdbd %{_initrddir}/slurmdbd
%{_sbindir}/rcslurmdbd
%endif %endif
%{_sbindir}/rcslurmdbd
%files plugins %files plugins
%defattr(-,root,root) %defattr(-,root,root)