From 9835d6581d35f2e382f258b15c5e70d1516acfa3fd2153dc84f6c22cb1ef7a2d Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 3 Mar 2014 14:58:29 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=531 --- systemd-mini.changes | 6 ++++++ systemd-mini.spec | 16 ++++++++++++---- systemd.changes | 6 ++++++ systemd.spec | 16 ++++++++++++---- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index e34d3943..c95a74e1 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 3 14:49:48 UTC 2014 - werner@suse.de + +- Generate the bash completion files on the fly for th ecase of + not having the package bash-completion around + ------------------------------------------------------------------- Mon Mar 3 13:58:11 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index 01b874bf..4e36bd56 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -781,6 +781,17 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/random-seed %fdupes -s %{buildroot}%{_mandir} +%if ! 0%{?bootstrap} +for f in %{buildroot}%{_datadir}/bash-completion/completions/* +do + test -e "$f" || break + grep -q _init_completion "$f" || continue + echo "%exclude %{_datadir}/bash-completion/completions/${f##*}" +done > files.completion +%else +> files.completion +%endif + %if 0%{suse_version} >= 1310 # packaged in systemd-rpm-macros rm -f %{buildroot}/%{_prefix}/lib/rpm/macros.d/macros.systemd @@ -1163,13 +1174,10 @@ exit 0 %ghost %{_localstatedir}/lib/systemd/random-seed %if ! 0%{?bootstrap} -%files bash-completion +%files bash-completion -f files.completion %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/* %endif diff --git a/systemd.changes b/systemd.changes index e34d3943..c95a74e1 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 3 14:49:48 UTC 2014 - werner@suse.de + +- Generate the bash completion files on the fly for th ecase of + not having the package bash-completion around + ------------------------------------------------------------------- Mon Mar 3 13:58:11 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index 28255dea..5d0416d4 100644 --- a/systemd.spec +++ b/systemd.spec @@ -776,6 +776,17 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/random-seed %fdupes -s %{buildroot}%{_mandir} +%if ! 0%{?bootstrap} +for f in %{buildroot}%{_datadir}/bash-completion/completions/* +do + test -e "$f" || break + grep -q _init_completion "$f" || continue + echo "%exclude %{_datadir}/bash-completion/completions/${f##*}" +done > files.completion +%else +> files.completion +%endif + %if 0%{suse_version} >= 1310 # packaged in systemd-rpm-macros rm -f %{buildroot}/%{_prefix}/lib/rpm/macros.d/macros.systemd @@ -1158,13 +1169,10 @@ exit 0 %ghost %{_localstatedir}/lib/systemd/random-seed %if ! 0%{?bootstrap} -%files bash-completion +%files bash-completion -f files.completion %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/* %endif