[python-novaclient/el6-havana] Use /etc/bash_completion.d instead of /etc/profile.d

[Jakub Ruzicka]

commit 689830c90b53c1b8db16b783ba604cf6077088f2
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date:   Wed Feb 26 22:14:54 2014 +0100

    Use /etc/bash_completion.d instead of /etc/profile.d
    
    Changelog:
    - Use /etc/bash_completion.d instead of /etc/profile.d
    - Remove {,test-}requirements.txt

 python-novaclient.spec |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/python-novaclient.spec b/python-novaclient.spec
index ebc063a..df67ab9 100644
--- a/python-novaclient.spec
+++ b/python-novaclient.spec
@@ -1,7 +1,7 @@
 Name:             python-novaclient
 Epoch:            1
 Version:          2.16.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Python API and CLI for OpenStack Nova
 
 Group:            Development/Languages
@@ -60,6 +60,8 @@ sed -i s/REDHATNOVACLIENTVERSION/%{version}/ novaclient/__init__.py
 # Remove bundled egg-info
 rm -rf python_novaclient.egg-info
 
+# Let RPM handle the requirements
+rm -f {,test-}requirements.txt
 
 %build
 %{__python} setup.py build
@@ -67,12 +69,9 @@ rm -rf python_novaclient.egg-info
 %install
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
-#mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
-#install -pm 644 tools/nova.bash_completion \
-#    %{buildroot}%{_sysconfdir}/bash_completion.d/nova
-# rhbz 888939#c7: bash-completion is not in RHEL
-mkdir -p %{buildroot}%{_sysconfdir}/profile.d
-install -pm 644 tools/nova.bash_completion %{buildroot}%{_sysconfdir}/profile.d/nova.sh
+mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
+install -pm 644 tools/nova.bash_completion \
+    %{buildroot}%{_sysconfdir}/bash_completion.d/nova
 
 # Delete tests
 rm -fr %{buildroot}%{python_sitelib}/novaclient/tests
@@ -92,13 +91,17 @@ rm -fr html/.doctrees html/.buildinfo
 %{_bindir}/nova
 %{python_sitelib}/novaclient
 %{python_sitelib}/*.egg-info
-%{_sysconfdir}/profile.d/nova.sh
+%{_sysconfdir}/bash_completion.d
 %{_mandir}/man1/nova.1.gz
 
 %files doc
 %doc html
 
 %changelog
+* Wed Feb 26 2014 Jakub Ruzicka <jruzicka at redhat.com> 2.16.0-2
+- Use /etc/bash_completion.d instead of /etc/profile.d
+- Remove {,test-}requirements.txt
+
 * Wed Feb 26 2014 Jakub Ruzicka <jruzicka at redhat.com> 2.16.0-1
 - Update to upstream 2.16.0