From 455598d98c78ca46aaffa2caac1b0f243fb24f25cd555de842f4b3a5539e00c7 Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Tue, 29 May 2018 10:43:47 +0000 Subject: [PATCH] Accepting request 611836 from home:kukuk:branches:server:database - Don't require systemd explicit, spec file can handle both cases correct and in containers we don't have systemd. OBS-URL: https://build.opensuse.org/request/show/611836 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=213 --- mariadb.changes | 6 ++++++ mariadb.spec | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/mariadb.changes b/mariadb.changes index cbc7e29..e6f5a16 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 23 15:23:00 CEST 2018 - kukuk@suse.de + +- Don't require systemd explicit, spec file can handle both cases + correct and in containers we don't have systemd. + ------------------------------------------------------------------- Fri May 18 11:02:12 UTC 2018 - kstreitova@suse.com diff --git a/mariadb.spec b/mariadb.spec index 8c9c966..1a19771 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -147,7 +147,11 @@ Provides: %{extra_provides} = %{version} Obsoletes: %{extra_provides} < %{version} Provides: %{extra_provides}-debug-version = %{version} Obsoletes: %{extra_provides}-debug-version < %{version} +%if 0%{?suse_version} < 1500 +# Explicit requires of systemd is not needed anymore and +# creates a problem for containers %{?systemd_requires} +%endif # Do not BuildRequires lzo for i586 and arm # https://lists.launchpad.net/maria-discuss/msg04639.html %ifnarch i586 %{arm}