From fdbef570eb3bc55a126ca399ba5613d967872ea4affefabc1c1a4e4ee37c88fb Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 8 Feb 2014 10:46:51 +0000 Subject: [PATCH] Accepting request 221379 from home:coolo:branches:openSUSE:Factory - split bash-completion support into its own package, no need for sles_version OBS-URL: https://build.opensuse.org/request/show/221379 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=509 --- systemd-mini.changes | 6 ++++++ systemd-mini.spec | 41 ++++++++++++++++------------------------- systemd.changes | 6 ++++++ systemd.spec | 41 ++++++++++++++++------------------------- 4 files changed, 44 insertions(+), 50 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 3a8f13f8..2fe26ede 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Feb 8 06:12:55 UTC 2014 - coolo@suse.com + +- split bash-completion support into its own package, + no need for sles_version + ------------------------------------------------------------------- Fri Feb 7 13:02:28 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index 9f09ab03..7831603d 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -23,15 +23,6 @@ %define udevpkgname udev-mini %define udev_major 1 -%if 0%{?sles_version} == 0 && 0%{?suse_version} == 1315 -%global sles_version 12 -%endif - -%if 0%{?sles_version} == 0 -%global with_bash_completion 1 -%endif -%bcond_with bash_completion - Name: systemd-mini Url: http://www.freedesktop.org/wiki/Software/systemd Version: 208 @@ -101,9 +92,7 @@ Conflicts: kiwi # the buildignore is important for bootstrapping #!BuildIgnore: udev Requires: %{udevpkgname} >= 172 -%if %{with bash_completion} -Recommends: bash-completion -%endif +Recommends: %{name}-bash-completion Requires: dbus-1 >= 1.4.0 Requires: kbd Requires: kmod >= 14 @@ -331,6 +320,15 @@ transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit. +%package bash-completion +Summary: Bash completion support for systemd +License: LGPL-2.1+ +Group: System/Base +Requires: bash +Requires: bash-completion + +%description bash-completion +Some systemd commands offer bash completion, but it's an optional dependency. %package devel Summary: Development headers for systemd @@ -799,16 +797,6 @@ install -m 644 units/powerfail.service %{buildroot}/%{_prefix}/lib/systemd/syste install -m 644 man/systemd-powerfail.service.8 %{buildroot}/%{_mandir}/man8/ %endif -# clean out some completions which requires bash-completion package -%if %{without bash_completion} -for c in %{buildroot}/%{_datadir}/bash-completion/completions/* -do - test -e "$c" || continue - grep -q _init_completion "$c" || continue - rm -vf "$c" -done -%endif - %fdupes -s %{buildroot}%{_mandir} %if 0%{suse_version} >= 1310 @@ -1169,10 +1157,7 @@ exit 0 %if ! 0%{?bootstrap} %{_prefix}/lib/udev/numlock-on %endif -%dir %{_datadir}/bash-completion -%dir %{_datadir}/bash-completion/completions %ghost /var/lib/systemd/catalog/database -%{_datadir}/bash-completion/completions/* %if 0%{suse_version} < 1310 %{_sysconfdir}/rpm/macros.systemd %endif @@ -1188,6 +1173,12 @@ exit 0 %ghost /var/lib/systemd/backlight %ghost /var/lib/systemd/random-seed +%files bash-completion +%defattr(-,root,root,-) +%dir %{_datadir}/bash-completion +%dir %{_datadir}/bash-completion/completions +%{_datadir}/bash-completion/completions/* + %files devel %defattr(-,root,root,-) %{_libdir}/libsystemd-daemon.so diff --git a/systemd.changes b/systemd.changes index 3a8f13f8..2fe26ede 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Feb 8 06:12:55 UTC 2014 - coolo@suse.com + +- split bash-completion support into its own package, + no need for sles_version + ------------------------------------------------------------------- Fri Feb 7 13:02:28 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index a5c7eceb..a57bc316 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,15 +21,6 @@ %define udevpkgname udev %define udev_major 1 -%if 0%{?sles_version} == 0 && 0%{?suse_version} == 1315 -%global sles_version 12 -%endif - -%if 0%{?sles_version} == 0 -%global with_bash_completion 1 -%endif -%bcond_with bash_completion - Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd Version: 208 @@ -96,9 +87,7 @@ Conflicts: kiwi # the buildignore is important for bootstrapping #!BuildIgnore: udev Requires: %{udevpkgname} >= 172 -%if %{with bash_completion} -Recommends: bash-completion -%endif +Recommends: %{name}-bash-completion Requires: dbus-1 >= 1.4.0 Requires: kbd Requires: kmod >= 14 @@ -326,6 +315,15 @@ transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit. +%package bash-completion +Summary: Bash completion support for systemd +License: LGPL-2.1+ +Group: System/Base +Requires: bash +Requires: bash-completion + +%description bash-completion +Some systemd commands offer bash completion, but it's an optional dependency. %package devel Summary: Development headers for systemd @@ -794,16 +792,6 @@ install -m 644 units/powerfail.service %{buildroot}/%{_prefix}/lib/systemd/syste install -m 644 man/systemd-powerfail.service.8 %{buildroot}/%{_mandir}/man8/ %endif -# clean out some completions which requires bash-completion package -%if %{without bash_completion} -for c in %{buildroot}/%{_datadir}/bash-completion/completions/* -do - test -e "$c" || continue - grep -q _init_completion "$c" || continue - rm -vf "$c" -done -%endif - %fdupes -s %{buildroot}%{_mandir} %if 0%{suse_version} >= 1310 @@ -1164,10 +1152,7 @@ exit 0 %if ! 0%{?bootstrap} %{_prefix}/lib/udev/numlock-on %endif -%dir %{_datadir}/bash-completion -%dir %{_datadir}/bash-completion/completions %ghost /var/lib/systemd/catalog/database -%{_datadir}/bash-completion/completions/* %if 0%{suse_version} < 1310 %{_sysconfdir}/rpm/macros.systemd %endif @@ -1183,6 +1168,12 @@ exit 0 %ghost /var/lib/systemd/backlight %ghost /var/lib/systemd/random-seed +%files bash-completion +%defattr(-,root,root,-) +%dir %{_datadir}/bash-completion +%dir %{_datadir}/bash-completion/completions +%{_datadir}/bash-completion/completions/* + %files devel %defattr(-,root,root,-) %{_libdir}/libsystemd-daemon.so