Backport macros.shell-completions from Fedora

Add a note that the older `%bash_completion_dir` macro is deprecated.

(cherry picked from commit c212ede694)
epel8
Todd Zullinger 2 years ago
parent 12d369f153
commit 945f3703f2

@ -1,6 +1,6 @@
Name: epel-rpm-macros Name: epel-rpm-macros
Version: 8 Version: 8
Release: 34 Release: 35
Summary: Extra Packages for Enterprise Linux RPM macros Summary: Extra Packages for Enterprise Linux RPM macros
License: GPLv2 License: GPLv2
@ -22,6 +22,7 @@ Source24: sysusers.generate-pre.sh
# misc macros # misc macros
Source150: macros.build-constraints Source150: macros.build-constraints
Source151: https://src.fedoraproject.org/rpms/redhat-rpm-config/raw/rawhide/f/macros.shell-completions
BuildArch: noarch BuildArch: noarch
Requires: redhat-release >= %{version} Requires: redhat-release >= %{version}
@ -92,7 +93,8 @@ install -Dpm 0755 %{SOURCE24} \
# misc macros # misc macros
install -Dpm 644 %{SOURCE150} \ install -Dpm 644 %{SOURCE150} \
%{buildroot}%{_rpmmacrodir}/macros.build-constraints %{buildroot}%{_rpmmacrodir}/macros.build-constraints
install -Dpm 644 %{SOURCE151} \
%{buildroot}%{_rpmmacrodir}/macros.shell-completions
%files %files
%license GPL %license GPL
@ -102,6 +104,7 @@ install -Dpm 644 %{SOURCE150} \
# misc macros # misc macros
%{_rpmmacrodir}/macros.build-constraints %{_rpmmacrodir}/macros.build-constraints
%{_rpmmacrodir}/macros.shell-completions
%files systemd %files systemd
# sysusers # sysusers
@ -112,6 +115,9 @@ install -Dpm 644 %{SOURCE150} \
%changelog %changelog
* Tue Nov 22 2022 Todd Zullinger <tmz@pobox.com> - 8-35
- Backport macros.shell-completions from Fedora
* Tue Nov 08 2022 Maxwell G <gotmax@e.email> - 8-34 * Tue Nov 08 2022 Maxwell G <gotmax@e.email> - 8-34
- Set %%__python3 to /usr/bin/python3.6 by default - Set %%__python3 to /usr/bin/python3.6 by default

@ -8,7 +8,10 @@
%_monogacdir %{_monodir}/gac %_monogacdir %{_monodir}/gac
# Bash completions; not in bash to not intefere with install ordering # Bash completions; not in bash to not intefere with install ordering
%bash_completion_dir %{_datadir}/bash-completion/completions/ #
# NOTE: This macro is deprecated; point to the preferred macro from
# macros.shell-completions
%bash_completion_dir %{bash_completions_dir}
# Use the non-underscored Python macros to refer to Python in spec, etc. # Use the non-underscored Python macros to refer to Python in spec, etc.
%python2 %__python2 %python2 %__python2

@ -0,0 +1,3 @@
%bash_completions_dir %{_datadir}/bash-completion/completions
%zsh_completions_dir %{_datadir}/zsh/site-functions
%fish_completions_dir %{_datadir}/fish/vendor_completions.d
Loading…
Cancel
Save