From 4d93f6971f75fc840ae4108ae5e10578b3280e6d270dc5b6216d3e557e3bd9f0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 14 Apr 2016 11:00:36 +0000 Subject: [PATCH] Accepting request 386175 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/386175 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=233 --- systemd-mini.changes | 5 +++++ systemd-mini.spec | 3 +++ systemd.changes | 5 +++++ systemd.spec | 3 +++ 4 files changed, 16 insertions(+) diff --git a/systemd-mini.changes b/systemd-mini.changes index 4ba2c424..38334909 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 7 12:13:16 UTC 2016 - schwab@suse.de + +- Avoid bootstrap cycle with sg3_utils + ------------------------------------------------------------------- Tue Apr 5 07:08:39 UTC 2016 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index f6b00696..6c58354f 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -393,7 +393,10 @@ Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html PreReq: /bin/rm PreReq: %insserv_prereq PreReq: %fillup_prereq +# Avoid bootstrap cycle with sg3_utils +%if "%{?mini}" == "" PreReq: /usr/bin/sg_inq +%endif Requires(pre): /usr/bin/stat Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/bin/getent diff --git a/systemd.changes b/systemd.changes index 4ba2c424..38334909 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 7 12:13:16 UTC 2016 - schwab@suse.de + +- Avoid bootstrap cycle with sg3_utils + ------------------------------------------------------------------- Tue Apr 5 07:08:39 UTC 2016 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index c2162ef0..c2c902a1 100644 --- a/systemd.spec +++ b/systemd.spec @@ -388,7 +388,10 @@ Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html PreReq: /bin/rm PreReq: %insserv_prereq PreReq: %fillup_prereq +# Avoid bootstrap cycle with sg3_utils +%if "%{?mini}" == "" PreReq: /usr/bin/sg_inq +%endif Requires(pre): /usr/bin/stat Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/bin/getent