forked from pool/slurm
Accepting request 766872 from home:dimstar:Factory
- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to shortcut through the -mini flavors. - Use systemd_ordering instead of systemd_requires: systemd is never a strict requirement; but in case the system is scheduled for installation together with systemd, we want systemd to be installed prior to slurm. - start slurmdbd after mariadb (bsc#1161716) OBS-URL: https://build.opensuse.org/request/show/766872 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=123
This commit is contained in:
parent
995841bad4
commit
345d1bbb94
@ -1,7 +1,17 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jan 24 11:47:58 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to
|
||||||
|
shortcut through the -mini flavors.
|
||||||
|
- Use systemd_ordering instead of systemd_requires: systemd is
|
||||||
|
never a strict requirement; but in case the system is scheduled
|
||||||
|
for installation together with systemd, we want systemd to be
|
||||||
|
installed prior to slurm.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jan 23 17:44:29 UTC 2020 - Christian Goll <cgoll@suse.com>
|
Thu Jan 23 17:44:29 UTC 2020 - Christian Goll <cgoll@suse.com>
|
||||||
|
|
||||||
- start slurmdbd after mariabd (bsc#1161716)
|
- start slurmdbd after mariadb (bsc#1161716)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jan 13 15:41:48 UTC 2020 - Egbert Eich <eich@suse.com>
|
Mon Jan 13 15:41:48 UTC 2020 - Egbert Eich <eich@suse.com>
|
||||||
|
@ -187,7 +187,7 @@ BuildRequires: libssh2-devel
|
|||||||
BuildRequires: rrdtool-devel
|
BuildRequires: rrdtool-devel
|
||||||
%if 0%{?with_systemd}
|
%if 0%{?with_systemd}
|
||||||
%{?systemd_requires}
|
%{?systemd_requires}
|
||||||
BuildRequires: systemd
|
BuildRequires: pkgconfig(systemd)
|
||||||
%else
|
%else
|
||||||
Requires(post): %insserv_prereq %fillup_prereq
|
Requires(post): %insserv_prereq %fillup_prereq
|
||||||
%endif
|
%endif
|
||||||
@ -330,7 +330,7 @@ Recommends: (%{name}-munge = %version if munge)
|
|||||||
Recommends: %{name}-munge = %version
|
Recommends: %{name}-munge = %version
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?with_systemd}
|
%if 0%{?with_systemd}
|
||||||
%{?systemd_requires}
|
%{?systemd_ordering}
|
||||||
%else
|
%else
|
||||||
Requires(post): %insserv_prereq %fillup_prereq
|
Requires(post): %insserv_prereq %fillup_prereq
|
||||||
%endif
|
%endif
|
||||||
@ -449,7 +449,7 @@ Recommends: (%{name}-munge = %version if munge)
|
|||||||
Recommends: %{name}-munge = %version
|
Recommends: %{name}-munge = %version
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?with_systemd}
|
%if 0%{?with_systemd}
|
||||||
%{?systemd_requires}
|
%{?systemd_ordering}
|
||||||
%else
|
%else
|
||||||
Requires(post): %insserv_prereq %fillup_prereq
|
Requires(post): %insserv_prereq %fillup_prereq
|
||||||
%endif
|
%endif
|
||||||
@ -469,7 +469,7 @@ Requires(pre): pwdutils
|
|||||||
Requires(pre): shadow
|
Requires(pre): shadow
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?with_systemd}
|
%if 0%{?with_systemd}
|
||||||
%{?systemd_requires}
|
%{?systemd_ordering}
|
||||||
%endif
|
%endif
|
||||||
%{?upgrade:Provides: %{pname}-config = %{version}}
|
%{?upgrade:Provides: %{pname}-config = %{version}}
|
||||||
%{?upgrade:Conflicts: %{pname}-config}
|
%{?upgrade:Conflicts: %{pname}-config}
|
||||||
|
Loading…
Reference in New Issue
Block a user