PR#55: Backport macros.shell-completions from Fedora - rpms/epel-rpm-macros

Todd Zullinger • 2 years ago

945f370

epel-rpm-macros.spec

file modified

+8 -2

		`@@ -1,6 +1,6 @@`
		`Name: epel-rpm-macros`
		`Version: 8`
		`- Release: 34`
		`+ Release: 35`
		`Summary: Extra Packages for Enterprise Linux RPM macros`

		`License: GPLv2`
		`@@ -22,6 +22,7 @@`

		`# misc macros`
		`Source150: macros.build-constraints`
		`+ Source151: https://src.fedoraproject.org/rpms/redhat-rpm-config/raw/rawhide/f/macros.shell-completions`

		`BuildArch: noarch`
		`Requires: redhat-release >= %{version}`
		`@@ -92,7 +93,8 @@`
		`# misc macros`
		`install -Dpm 644 %{SOURCE150} \`
		`%{buildroot}%{_rpmmacrodir}/macros.build-constraints`
		`-`
		`+ install -Dpm 644 %{SOURCE151} \`
		`+ %{buildroot}%{_rpmmacrodir}/macros.shell-completions`

		`%files`
		`%license GPL`
		`@@ -102,6 +104,7 @@`

		`# misc macros`
		`%{_rpmmacrodir}/macros.build-constraints`
		`+ %{_rpmmacrodir}/macros.shell-completions`

		`%files systemd`
		`# sysusers`
		`@@ -112,6 +115,9 @@`


		`%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`
		`- Set %%__python3 to /usr/bin/python3.6 by default`

macros.epel-rpm-macros

file modified

+4 -1

		`@@ -8,7 +8,10 @@`
		`%_monogacdir %{_monodir}/gac`

		`# 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.`
		`%python2 %__python2`

macros.shell-completions

file added

		`@@ -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`