[python-django15] bash_completion shall not conflict

Matthias Runge mrunge at fedoraproject.org
Thu Jun 12 10:04:33 UTC 2014


commit 4b0db18ce8551b7de5ac930b3c43cc52d155199a
Author: Matthias Runge <mrunge at redhat.com>
Date:   Thu Jun 12 12:04:13 2014 +0200

    bash_completion shall not conflict

 python-django15.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/python-django15.spec b/python-django15.spec
index 0789566..9fcd3bc 100644
--- a/python-django15.spec
+++ b/python-django15.spec
@@ -19,7 +19,7 @@
 
 Name:           python-django15
 Version:        1.5.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -200,6 +200,7 @@ mv %{buildroot}%{_bindir}/django-admin.py %{buildroot}%{_bindir}/django1.5-admin
 mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d/
 install -m 0644 -p extras/django_bash_completion \
    %{buildroot}%{_sysconfdir}/bash_completion.d/
+mv %{buildroot}%{_sysconfdir}/bash_completion.d/django_bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/django15_bash_completion
 
 
 # remove .po files
@@ -232,7 +233,7 @@ cd tests
 %endif # with_python3
 %{_bindir}/django1.5-admin
 %dir %{_sysconfdir}/bash_completion.d/
-%config(noreplace) %{_sysconfdir}/bash_completion.d/django_bash_completion
+%config(noreplace) %{_sysconfdir}/bash_completion.d/django15_bash_completion
 # Include everything but the locale data ...
 
 %{python2_sitelib}/%{pkgname}-%{version}-py?.?.egg/EGG-INFO
@@ -627,6 +628,9 @@ cd tests
 
 
 %changelog
+* Thu Jun 12 2014 Matthias Runge <mrunge at redhat.com> - 1.5.8-3
+- make sure, bash-completion does not conflict
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list