Revert "Split shell-completions into a separate subpackage"

This adds extra complexity, and I think providing shell completions by
default provides a better user experience.
This commit is contained in:
Maxwell G 2022-10-27 23:04:38 -05:00
parent 77248be77b
commit e58c15902d
No known key found for this signature in database
GPG Key ID: F79E4E25E8C661F8

View File

@ -61,12 +61,12 @@ BuildRequires: python%{python3_pkgversion}-systemd
BuildRequires: /usr/bin/python
%endif
Requires: python%{python3_pkgversion}-argcomplete
# Require packaging macros if rpm-build exists
# This makes the transition seamless for other packages
# This is DEPRECATED. Packages must explicitly BuildRequire ansible-packaging.
Requires: (ansible-packaging if rpm-build)
Recommends: ansible-core-shell-completions
%global _description %{expand:
Ansible is a radically simple model-driven configuration management,
@ -88,15 +88,6 @@ Obsoletes: ansible-base-doc < 2.10.6-1
This package installs extensive documentation for ansible-core
%package shell-completions
Summary: Shell completions for ansible-core
Requires: python%{python3_pkgversion}-argcomplete
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description shell-completions %_description
This package includes shell completions files for ansible-core.
%prep
%autosetup -p1 -n ansible-%{uversion}
@ -218,6 +209,8 @@ make PYTHON=%{python3} tests-py3
%config(noreplace) %{_sysconfdir}/ansible/*
%{_bindir}/ansible*
%{_datadir}/ansible/
%{bash_completions_dir}/ansible*
%{fish_completions_dir}/ansible*.fish
%{_mandir}/man1/ansible*
%files doc
@ -226,10 +219,6 @@ make PYTHON=%{python3} tests-py3
%doc docs/docsite/_build/html
%endif
%files shell-completions
%{bash_completions_dir}/ansible*
%{fish_completions_dir}/ansible*.fish
%changelog
* Fri Oct 28 2022 Maxwell G <gotmax@e.email> - 2.14.0~rc1-1