diff --git a/slurm.changes b/slurm.changes index 87a7d09..5e4691f 100644 --- a/slurm.changes +++ b/slurm.changes @@ -1,7 +1,17 @@ +------------------------------------------------------------------- +Fri Jan 24 11:47:58 UTC 2020 - Dominique Leuenberger + +- 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 -- start slurmdbd after mariabd (bsc#1161716) +- start slurmdbd after mariadb (bsc#1161716) ------------------------------------------------------------------- Mon Jan 13 15:41:48 UTC 2020 - Egbert Eich diff --git a/slurm.spec b/slurm.spec index 14c8edb..d158ac4 100644 --- a/slurm.spec +++ b/slurm.spec @@ -187,7 +187,7 @@ BuildRequires: libssh2-devel BuildRequires: rrdtool-devel %if 0%{?with_systemd} %{?systemd_requires} -BuildRequires: systemd +BuildRequires: pkgconfig(systemd) %else Requires(post): %insserv_prereq %fillup_prereq %endif @@ -330,7 +330,7 @@ Recommends: (%{name}-munge = %version if munge) Recommends: %{name}-munge = %version %endif %if 0%{?with_systemd} -%{?systemd_requires} +%{?systemd_ordering} %else Requires(post): %insserv_prereq %fillup_prereq %endif @@ -449,7 +449,7 @@ Recommends: (%{name}-munge = %version if munge) Recommends: %{name}-munge = %version %endif %if 0%{?with_systemd} -%{?systemd_requires} +%{?systemd_ordering} %else Requires(post): %insserv_prereq %fillup_prereq %endif @@ -469,7 +469,7 @@ Requires(pre): pwdutils Requires(pre): shadow %endif %if 0%{?with_systemd} -%{?systemd_requires} +%{?systemd_ordering} %endif %{?upgrade:Provides: %{pname}-config = %{version}} %{?upgrade:Conflicts: %{pname}-config}