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

rpms / epel-rpm-macros

#58 Backport macros.shell-completions from Fedora

Merged a year ago by sergiomb. Opened 2 years ago by tmz.

rpms/ tmz/epel-rpm-macros tmz/epel7-shell-completions into epel7

Backport macros.shell-completions from Fedora

Todd Zullinger • 2 years ago

2c964fa

epel-rpm-macros.spec

file modified

+8 -1

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

		`Group: System Environment/Base`
		`@@ -23,6 +23,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}`
		`@@ -76,12 +77,15 @@`
		`# misc macros`
		`install -Dpm 644 %{SOURCE150} \`
		`%{buildroot}%{_rpmconfigdir}/macros.d/macros.build-constraints`
		`+ install -Dpm 644 %{SOURCE151} \`
		`+ %{buildroot}%{_rpmmacrodir}/macros.shell-completions`

		`%files`
		`%license GPL`
		`%{_rpmconfigdir}/macros.d/macros.epel-rpm-macros`
		`%{_sysconfdir}/rpm/macros.zzz-epel-override`
		`%{_rpmconfigdir}/gpgverify`
		`+ %{_rpmmacrodir}/macros.shell-completions`

		`# misc macros`
		`%{_rpmconfigdir}/macros.d/macros.build-constraints`
		`@@ -94,6 +98,9 @@`
		`%{_rpmconfigdir}/sysusers.generate-pre.sh`

		`%changelog`
		`+ * Tue Nov 22 2022 Todd Zullinger <tmz@pobox.com> - 7-36`
		`+ - Backport macros.shell-completions from Fedora`
		`+`
		`* Mon Jan 31 2022 Pablo Greco <pgreco@centosproject.org> - 7-35`
		`- Backport systemd sysusers macros from Fedora`

macros.epel-rpm-macros

file modified

+4 -1

		`@@ -21,7 +21,10 @@`
		`%vimfiles_root %{_datadir}/vim/vimfiles`

		`# Bash completions; not in bash to not intefere with install ordering`
		`- %bash_completion_dir /usr/share/bash-completion/completions/`
		`+ #`
		`+ # NOTE: This macro is deprecated; point to the preferred macro from`
		`+ # macros.shell-completions`
		`+ %bash_completion_dir %{bash_completions_dir}`

		`# vpath macros, backported from Fedora`
		`# directory where CMakeLists.txt/meson.build/etc. are placed`

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`

tmz commented 2 years ago

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

(cherry picked from commit c212ede)

As mentioned on the devel list: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/VVL2OAMMA77V37LRBAIV5FH56IJFPWZM/

sergiomb commented a year ago

this PR shouldn't be for epel9 ? or and epel9 ?

Pull-Request has been merged by sergiomb

a year ago

tmz commented a year ago

This, like #57, is aimed at backporting in macros.shell-completions which is already in epel9, added in c212ede (Backport macros.shell-completions from Fedora, 2022-09-01).

A separate PR for epel9 could be filed to deprecate %bash_completion_dir there, since it was already present and not deprecated when c212ede was added there. A large note/warning in the macro file to not copy it to epel10 when it is branched might help avoid it slipping into yet another release.

sergiomb commented a year ago

This, like #57, is aimed at backporting in macros.shell-completions which is already in epel9, added in c212ede (Backport macros.shell-completions from Fedora, 2022-09-01).

Right , I also saw that, but just after comment here ...

A separate PR for epel9 could be filed to deprecate %bash_completion_dir there, since it was already present and not deprecated when c212ede was added there.

yes, now we need an PR to deprecate %bash_completion_dirin epel9, epel8 and epel7 ...

Thank you