move bash-completion scripts to /usr/share/ BZ 922992

rpm-software-management · Mar 27, 2013 · f0bd913 · f0bd913
1 parent e4f4dc2
commit f0bd913
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -28,7 +28,7 @@ install:
  done
  chmod 755 $(DESTDIR)/usr/share/yum-cli/completion-helper.py
  mv $(DESTDIR)/usr/share/yum-cli/yum-updatesd.py $(DESTDIR)/usr/share/yum-cli/yumupd.py
- $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/usr/share/yum-cli', 1, '$(PYDIR)', 1)"
+ $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/usr/share/yum-cli', 1, '/usr/share/yum-cli', 1)"
 
  mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)/usr/sbin
  install -m 755 bin/yum.py $(DESTDIR)/usr/bin/yum

diff --git a/etc/Makefile b/etc/Makefile
@@ -1,4 +1,6 @@
 YUMETC=$(DESTDIR)/etc/yum
+compdir = $(shell pkg-config --variable=completionsdir bash-completion)
+compdir := $(or $(compdir), "/etc/bash_completion.d")
 
 all:
  echo "Nothing to do"
@@ -25,6 +27,7 @@ install:
  mkdir -p $(DESTDIR)/etc/dbus-1/system.d/
  install -m 755 yum-updatesd-dbus.conf $(DESTDIR)/etc/dbus-1/system.d/yum-updatesd.conf
  install -m 644 yum-updatesd.conf $(YUMETC)
- mkdir -p $(DESTDIR)/etc/bash_completion.d
- install -m 644 yum.bash $(DESTDIR)/etc/bash_completion.d
+ mkdir -p $(DESTDIR)/$(compdir)
+ install -m 644 yum.bash $(DESTDIR)/$(compdir)/yum
+ ln -s yum $(DESTDIR)/$(compdir)/yummain.py
  install -m 644 yum-cron.conf $(YUMETC)
diff --git a/yum.spec b/yum.spec
@@ -26,6 +26,13 @@
 %define yum_pluginslib /usr/lib/yum-plugins
 %define yum_pluginsshare /usr/share/yum-plugins
 
+# disable broken /usr/lib/rpm/brp-python-bytecompile
+%define __os_install_post %{nil}
+%define compdir %(pkg-config --variable=completionsdir bash-completion)
+%if "%{compdir}" == ""
+%define compdir "/etc/bash_completion.d"
+%endif
+
 Summary: RPM package installer/updater/manager
 Name: yum
 Version: 3.4.3
@@ -47,6 +54,7 @@ BuildRequires: python-sqlite
 BuildRequires: python-urlgrabber >= 3.9.0-8
 BuildRequires: yum-metadata-parser >= 1.1.0
 BuildRequires: pygpgme
+BuildRequires: bash-completion
 # End of CheckRequires
 Conflicts: pirut < 1.1.4
 Requires: python >= 2.4
@@ -321,7 +329,7 @@ exit 0
 %dir %{_sysconfdir}/yum/protected.d
 %dir %{_sysconfdir}/yum/vars
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%{_sysconfdir}/bash_completion.d
+%(dirname %{compdir})
 %dir %{_datadir}/yum-cli
 %{_datadir}/yum-cli/*
 %exclude %{_datadir}/yum-cli/completion-helper.py?