From fcbdb34db71a8461861ca9c82b94eba20b43ae33b38e6c0e1758d67e5ceb11b4 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 8 Apr 2016 09:28:10 +0000 Subject: [PATCH] Accepting request 385773 from home:Andreas_Schwab:Factory - Avoid bootstrap cycle with sg3_utils OBS-URL: https://build.opensuse.org/request/show/385773 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=938 --- 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