put bash completions in /usr/share/bash-completion/completions/

Author: stevegrubb

ChangeLog

@@ -1,4 +1,5 @@
 4.1.5
+- Put the bash completions in /usr/share/bash-completion/completions/
 
 4.1.4
 - Update syscalls and io_uring tables for the 7.0 kernel (Hilko Bengen)

audit.spec

@@ -235,7 +235,7 @@ fi
 %attr(750,root,root) %{_libexecdir}/initscripts/legacy-actions/auditd/rotate
 %attr(750,root,root) %{_libexecdir}/initscripts/legacy-actions/auditd/state
 %attr(750,root,root) %{_libexecdir}/initscripts/legacy-actions/auditd/stop
-%attr(644,root,root) %{_sysconfdir}/bash_completion.d/audit.bash_completion
+%attr(644,root,root) %{_datadir}/bash-completion/completions/audit.bash_completion
 %ghost %{_runstatedir}/%{name}/auditd.state
 %attr(-,root,-) %dir %{_var}/log/audit
 %attr(750,root,root) %dir /etc/audit/plugins.d

init.d/Makefile.am

@@ -32,6 +32,7 @@ EXTRA_DIST = auditd.service.in audit-rules.service.in augenrules.in \
 libconfig = libaudit.conf
 initdir = $(prefix)/lib/systemd/system
 legacydir = $(libexecdir)/initscripts/legacy-actions/auditd
+bashcompdir = $(datadir)/bash-completion/completions
 
 auditdir = $(sysconfdir)/audit
 auditrdir = $(auditdir)/rules.d
@@ -53,12 +54,12 @@ install-data-hook:
 
 install-exec-hook:
 	mkdir -p ${DESTDIR}${initdir}
-	mkdir -p ${DESTDIR}${sysconfdir}/bash_completion.d
+	mkdir -p ${DESTDIR}${bashcompdir}
 	$(INSTALL_SCRIPT) -D -m 644 ${builddir}/auditd.service ${DESTDIR}${initdir}
 	$(INSTALL_SCRIPT) -D -m 644 ${builddir}/audit-rules.service ${DESTDIR}${initdir}
 	chmod 0755 $(DESTDIR)$(sbindir)/augenrules
 	$(INSTALL_SCRIPT) -D -m 644 ${srcdir}/audit.bash_completion \
-		${DESTDIR}${sysconfdir}/bash_completion.d/
+		${DESTDIR}${bashcompdir}
 if INSTALL_LEGACY_ACTIONS
 	mkdir -p ${DESTDIR}${legacydir}
 	$(INSTALL_SCRIPT) -D -m 750 ${srcdir}/auditd.rotate ${DESTDIR}${legacydir}/rotate
@@ -84,4 +85,4 @@ if INSTALL_LEGACY_ACTIONS
 	rm ${DESTDIR}${legacydir}/condrestart
 endif
 	rm ${DESTDIR}$(prefix)/lib/tmpfiles.d/audit.conf
-	rm ${DESTDIR}${sysconfdir}/bash_completion.d/audit.bash_completion
+	rm ${DESTDIR}${bashcompdir}/audit.bash_completion

init.d/audit.bash_completion

@@ -1,5 +1,5 @@
 # Bash completion for audit utilities
-# Installed to /etc/bash_completion.d/audit
+# Installed to /usr/share/bash-completion/completions/
 
 _ausearch_opts="--event --arch --comm --debug --checkpoint --eoe-timeout \
 --exit --escape --extra-keys --extra-labels --extra-obj2 --extra-time \