From 19426b88e906f1d09c314844cb59d84cdf64a9a56b15b92b13a3531e11714c14 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Sun, 9 Feb 2014 18:45:14 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=511 --- systemd-mini.changes | 12 ++++++++++++ systemd-mini.spec | 6 ++++++ systemd.changes | 7 +++++++ systemd.spec | 6 ++++++ 4 files changed, 31 insertions(+) diff --git a/systemd-mini.changes b/systemd-mini.changes index 2fe26ede..71dd4ef8 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Feb 9 18:43:38 UTC 2014 - werner@suse.de + +- ... as only the systemd-analyze completion depends on + bash-completion I prefere a without which has to be defined + for SLES 12 + +------------------------------------------------------------------- +Sun Feb 9 11:21:07 UTC 2014 - coolo@suse.com + +- avoid bootstrap cycle with libusb and systemd-mini + ------------------------------------------------------------------- Sat Feb 8 06:12:55 UTC 2014 - coolo@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 0580f289..8e1b7018 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -22,6 +22,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define udevpkgname udev-mini %define udev_major 1 +%bcond_without bash_completion Name: systemd-mini Url: http://www.freedesktop.org/wiki/Software/systemd @@ -325,7 +326,9 @@ Summary: Bash completion support for systemd License: LGPL-2.1+ Group: System/Base Requires: bash +%if %{with bash_completion} Requires: bash-completion +%endif %description bash-completion Some systemd commands offer bash completion, but it's an optional dependency. @@ -1177,6 +1180,9 @@ exit 0 %defattr(-,root,root,-) %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions +%if %{without bash_completion} +%exclude %{_datadir}/bash-completion/completions/systemd-analyze +%endif %{_datadir}/bash-completion/completions/* %files devel diff --git a/systemd.changes b/systemd.changes index 00ff6da4..71dd4ef8 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Feb 9 18:43:38 UTC 2014 - werner@suse.de + +- ... as only the systemd-analyze completion depends on + bash-completion I prefere a without which has to be defined + for SLES 12 + ------------------------------------------------------------------- Sun Feb 9 11:21:07 UTC 2014 - coolo@suse.com diff --git a/systemd.spec b/systemd.spec index 19b58ef6..eff98543 100644 --- a/systemd.spec +++ b/systemd.spec @@ -20,6 +20,7 @@ %define real systemd %define udevpkgname udev %define udev_major 1 +%bcond_without bash_completion Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd @@ -320,7 +321,9 @@ Summary: Bash completion support for systemd License: LGPL-2.1+ Group: System/Base Requires: bash +%if %{with bash_completion} Requires: bash-completion +%endif %description bash-completion Some systemd commands offer bash completion, but it's an optional dependency. @@ -1172,6 +1175,9 @@ exit 0 %defattr(-,root,root,-) %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions +%if %{without bash_completion} +%exclude %{_datadir}/bash-completion/completions/systemd-analyze +%endif %{_datadir}/bash-completion/completions/* %files devel