SHA256
1
0
forked from pool/slurm

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

- Fix Requires(pre) and Requires(post) for slurm-config and slurm-node.
  This fixes issues with failing slurm user creation when installed
  during initial system installation (bsc#1109373).

OBS-URL: https://build.opensuse.org/request/show/637165
OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=69
This commit is contained in:
Egbert Eich 2018-09-22 07:50:55 +00:00 committed by Git OBS Bridge
parent dbb82d64bd
commit 410ad28aca
2 changed files with 22 additions and 7 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Sep 22 06:09:18 UTC 2018 - eich@suse.com
- Fix Requires(pre) and Requires(post) for slurm-config and slurm-node.
This fixes issues with failing slurm user creation when installed
during initial system installation (bsc#1109373).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 14 10:26:43 UTC 2018 - eich@suse.com Tue Aug 14 10:26:43 UTC 2018 - eich@suse.com

View File

@ -77,11 +77,6 @@ Patch9: slurmctld-rerun-agent_init-when-backup-controller-takes-over.pat
Requires: slurm-config = %{version} Requires: slurm-config = %{version}
Requires: slurm-node = %{version} Requires: slurm-node = %{version}
%if 0%{?suse_version} <= 1140
Requires(pre): pwdutils
%else
Requires(pre): shadow
%endif
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: gtk2-devel BuildRequires: gtk2-devel
@ -111,7 +106,7 @@ BuildRequires: freeipmi-devel
%{?systemd_requires} %{?systemd_requires}
BuildRequires: systemd BuildRequires: systemd
%else %else
PreReq: %insserv_prereq %fillup_prereq Requires(post): %insserv_prereq %fillup_prereq
%endif %endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Obsoletes: slurm-sched-wiki < %{version} Obsoletes: slurm-sched-wiki < %{version}
@ -213,7 +208,7 @@ Recommends: slurm-munge = %{version}
%if 0%{?with_systemd} %if 0%{?with_systemd}
%{?systemd_requires} %{?systemd_requires}
%else %else
PreReq: %insserv_prereq %fillup_prereq Requires(post): %insserv_prereq %fillup_prereq
%endif %endif
Obsoletes: slurm-sched-wiki < %{version} Obsoletes: slurm-sched-wiki < %{version}
Obsoletes: slurmdb-direct < %{version} Obsoletes: slurmdb-direct < %{version}
@ -306,6 +301,11 @@ Group: Productivity/Clustering/Computing
Requires: slurm-config = %{version} Requires: slurm-config = %{version}
Requires: slurm-plugins = %{version} Requires: slurm-plugins = %{version}
Recommends: %{name}-munge Recommends: %{name}-munge
%if 0%{?with_systemd}
%{?systemd_requires}
%else
Requires(post): %insserv_prereq %fillup_prereq
%endif
%description node %description node
This package contains just the minmal code to run a compute node. This package contains just the minmal code to run a compute node.
@ -313,6 +313,14 @@ This package contains just the minmal code to run a compute node.
%package config %package config
Summary: Config files and directories for slurm services Summary: Config files and directories for slurm services
Group: Productivity/Clustering/Computing Group: Productivity/Clustering/Computing
%if 0%{?suse_version} <= 1140
Requires(pre): pwdutils
%else
Requires(pre): shadow
%endif
%if 0%{?with_systemd}
%{?systemd_requires}
%endif
%description config %description config
This package contains the slurm config files necessary direcories This package contains the slurm config files necessary direcories