[python-django/f20] remove use of simplejson, bash completion sub-pack

[Matthias Runge]

commit 9d7d18cfe53c6711a6fd2542ca995077a7ee4e9e
Author: Matthias Runge <mrunge at redhat.com>
Date:   Thu Mar 27 13:27:48 2014 +0100

    remove use of simplejson, bash completion sub-pack

 python-django.spec |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)
---
diff --git a/python-django.spec b/python-django.spec
index d2ed407..39a4c65 100644
--- a/python-django.spec
+++ b/python-django.spec
@@ -17,7 +17,7 @@
 
 Name:           python-django
 Version:        1.6.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -32,7 +32,6 @@ BuildArch:      noarch
 # BuildRequires:  python-setuptools
 BuildRequires:  python2-devel
 # required for docs
-BuildRequires:  python-simplejson
 %if 0%{?rhel} == 6
 BuildRequires:  python-sphinx10
 %else
@@ -41,14 +40,8 @@ BuildRequires:  python-sphinx
 
 %if 0%{?with_python3}
 BuildRequires:  python3-devel
-# required for docs
-Buildrequires:  python3-simplejson
 %endif
-
-# for testing
-BuildRequires:  python-simplejson
-
-Requires:       python-simplejson
+Requires:       %{name}-bash-completion = %{version}-%{release}
 
 # allow users to use django with lowercase d
 Provides:       django = %{version}-%{release}
@@ -75,6 +68,14 @@ Obsoletes:      %{pkgname}-docs < %{obs_ver}
 This package contains the documentation for the Django high-level
 Python Web framework.
 
+%package bash-completion
+Summary:        bash completion files for Django
+
+
+%description bash-completion
+This package contains the bash completion files form Django high-level
+Python Web framework.
+
 %if 0%{?with_python3}
 %package -n python3-django-doc
 Summary:        Documentation for Django
@@ -90,6 +91,7 @@ Summary:        A high-level Python Web framework
 Group:          Development/Languages
 
 Requires:       python3
+Requires:       %{name}-bash-completion = %{version}-%{release}
 
 %description -n python3-django
 Django is a high-level Python Web framework that encourages rapid
@@ -220,8 +222,6 @@ popd
 %attr(0755,root,root) %{python_sitelib}/django/bin/daily_cleanup.py*
 %attr(0755,root,root) %{python_sitelib}/django/bin/django-admin.py*
 %attr(0755,root,root) %{python_sitelib}/django/bin/django-2to3.py*
-%dir %{_sysconfdir}/bash_completion.d/
-%config(noreplace) %{_sysconfdir}/bash_completion.d/django_bash_completion
 %dir %{python_sitelib}/django/bin/profiling/
 %attr(0755,root,root) %{python_sitelib}/django/bin/profiling/gather_profile_stats.py
 # Include everything but the locale data ...
@@ -385,6 +385,10 @@ popd
 %files doc
 %doc docs/_build/html/*
 
+%files bash-completion
+%dir %{_sysconfdir}/bash_completion.d/
+%config(noreplace) %{_sysconfdir}/bash_completion.d/django_bash_completion
+
 %if 0%{?with_python3}
 %files -n python3-django-doc
 %doc docs/_build/html/*
@@ -403,8 +407,6 @@ popd
 %attr(0755,root,root) %{python3_sitelib}/django/bin/daily_cleanup.py*
 %attr(0755,root,root) %{python3_sitelib}/django/bin/django-admin.py*
 %attr(0755,root,root) %{python3_sitelib}/django/bin/django-2to3.py*
-%dir %{_sysconfdir}/bash_completion.d/
-%config(noreplace) %{_sysconfdir}/bash_completion.d/django_bash_completion
 %dir %{python3_sitelib}/django/bin/profiling/
 %attr(0755,root,root) %{python3_sitelib}/django/bin/profiling/gather_profile_stats.py
 # Include everything but the locale data ...
@@ -585,6 +587,10 @@ popd
 
 
 %changelog
+* Thu Mar 27 2014 Matthias Runge <mrunge at redhat.com> - 1.6.2-2
+- remove simplejson requirement
+- make bash-completion a sub-package, both main packages can require
+
 * Thu Feb 13 2014 Matthias Runge <mrunge at redhat.com> - 1.6.2-1
 - update to 1.6.2 (rhbz#1027766)
 - bash completion for python3-django-admin (rhbz#1035987)