[python-django] update to Django-1.7
Matthias Runge
mrunge at fedoraproject.org
Fri Oct 17 11:50:49 UTC 2014
commit 8ce266494fbcbb5ae39c6970c07e8e8ab40b2eba
Author: Matthias Runge <mrunge at redhat.com>
Date: Fri Oct 17 13:50:11 2014 +0200
update to Django-1.7
.gitignore | 1 +
...ion => python-django-1.7-shell-completion.patch | 8 +-
python-django.spec | 64 ++++++++++----------
sources | 2 +-
4 files changed, 38 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 840791d..fa1dbc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
/Django-1.6.5.tar.gz
/Django-1.6.6.tar.gz
/Django-1.6.7.tar.gz
+/Django-1.7.tar.gz
diff --git a/python-django-1.6-py3-admin-completion b/python-django-1.7-shell-completion.patch
similarity index 52%
rename from python-django-1.6-py3-admin-completion
rename to python-django-1.7-shell-completion.patch
index f2516e6..c2ccd1c 100644
--- a/python-django-1.6-py3-admin-completion
+++ b/python-django-1.7-shell-completion.patch
@@ -1,9 +1,9 @@
-diff -up extras/django_bash_completion.orig extras/django_bash_completion
---- extras/django_bash_completion.orig 2014-02-13 14:45:39.747042250 +0100
-+++ extras/django_bash_completion 2014-02-13 14:46:15.247949606 +0100
+diff -up ./extras/django_bash_completion.bak ./extras/django_bash_completion
+--- ./extras/django_bash_completion.bak 2014-10-17 11:27:00.027389289 +0200
++++ ./extras/django_bash_completion 2014-10-17 11:27:33.117330255 +0200
@@ -37,7 +37,7 @@ _django_completion()
COMP_CWORD=$COMP_CWORD \
- DJANGO_AUTO_COMPLETE=1 $1 ) )
+ DJANGO_AUTO_COMPLETE=1 $1 ) )
}
-complete -F _django_completion -o default django-admin.py manage.py django-admin
+complete -F _django_completion -o default django-admin.py manage.py django-admin python3-django-admin
diff --git a/python-django.spec b/python-django.spec
index 20196cb..bfd5ee7 100644
--- a/python-django.spec
+++ b/python-django.spec
@@ -17,7 +17,7 @@
Name: python-django
-Version: 1.6.7
+Version: 1.7
Release: 1%{?dist}
Summary: A high-level Python Web framework
@@ -26,18 +26,13 @@ License: BSD
URL: http://www.djangoproject.com/
Source0: http://pypi.python.org/packages/source/D/Django/Django-%{version}.tar.gz
-Patch0: python-django-1.6-py3-admin-completion
+Patch0: python-django-1.7-shell-completion.patch
BuildArch: noarch
# Note: No longer required in development version > 0.95
# BuildRequires: python-setuptools
BuildRequires: python2-devel
-# required for docs
-%if 0%{?rhel} == 6
-BuildRequires: python-sphinx10
-%else
BuildRequires: python-sphinx
-%endif
%if 0%{?with_python3}
BuildRequires: python3-devel
@@ -104,6 +99,9 @@ principle.
%prep
%setup -q -n %{pkgname}-%{version}
+# remove bundled egg-info
+rm -rf Django.egg-info
+
%patch0
# empty files
@@ -180,7 +178,6 @@ mkdir -p %{buildroot}%{_mandir}/man1/
cp -p docs/man/* %{buildroot}%{_mandir}/man1/
%if 0%{?with_python3}
cp -a %{buildroot}%{_mandir}/man1/django-admin.1 %{buildroot}%{_mandir}/man1/python3-django-admin.1
-cp -a %{buildroot}%{_mandir}/man1/daily_cleanup.1 %{buildroot}%{_mandir}/man1/python3-daily_cleanup.1
cp -a %{buildroot}%{_mandir}/man1/gather_profile_stats.1 %{buildroot}%{_mandir}/man1/python3-gather_profile_stats.1
%endif # with_python3
@@ -219,20 +216,17 @@ popd
%exclude %{_mandir}/man1/python3-*
%endif # with_python3
%{_bindir}/django-admin
-%attr(0755,root,root) %{python_sitelib}/django/bin/*-messages.py*
-%attr(0755,root,root) %{python_sitelib}/django/bin/daily_cleanup.py*
+#%attr(0755,root,root) %{python_sitelib}/django/bin/*-messages.py*
%attr(0755,root,root) %{python_sitelib}/django/bin/django-admin.py*
-%attr(0755,root,root) %{python_sitelib}/django/bin/django-2to3.py*
-%dir %{python_sitelib}/django/bin/profiling/
-%attr(0755,root,root) %{python_sitelib}/django/bin/profiling/gather_profile_stats.py
+#%attr(0755,root,root) %{python_sitelib}/django/bin/django-2to3.py*
+#%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 ...
%dir %{python_sitelib}/django
%dir %{python_sitelib}/django/bin
-%{python_sitelib}/django/bin/profiling/__init__.py*
-%{python_sitelib}/django/bin/profiling/gather_profile_stats.py?
+%{python_sitelib}/django/apps
%{python_sitelib}/django/db/
%{python_sitelib}/django/*.py*
-%{python_sitelib}/django/shortcuts/
%{python_sitelib}/django/utils/
%{python_sitelib}/django/dispatch/
%{python_sitelib}/django/template/
@@ -250,9 +244,7 @@ popd
%dir %{python_sitelib}/django/contrib/admin/locale/??_*/
%dir %{python_sitelib}/django/contrib/admin/locale/*/LC_MESSAGES
%{python_sitelib}/django/contrib/admin/*.py*
-%dir %{python_sitelib}/django/contrib/admin/bin/
-%attr(0755,root,root) %{python_sitelib}/django/contrib/admin/bin/compress.py
-%{python_sitelib}/django/contrib/admin/bin/compress.py?
+%{python_sitelib}/django/contrib/admin/migrations
%{python_sitelib}/django/contrib/admin/views/
%{python_sitelib}/django/contrib/admin/static/
%{python_sitelib}/django/contrib/admin/templatetags/
@@ -274,6 +266,7 @@ popd
%{python_sitelib}/django/contrib/auth/fixtures/
%{python_sitelib}/django/contrib/auth/handlers/
%{python_sitelib}/django/contrib/auth/management/
+%{python_sitelib}/django/contrib/auth/migrations/
%{python_sitelib}/django/contrib/auth/templates/
%{python_sitelib}/django/contrib/auth/tests/
%dir %{python_sitelib}/django/contrib/comments/
@@ -290,7 +283,9 @@ popd
%dir %{python_sitelib}/django/contrib/contenttypes/locale/??/
%dir %{python_sitelib}/django/contrib/contenttypes/locale/??_*/
%dir %{python_sitelib}/django/contrib/contenttypes/locale/*/LC_MESSAGES
+%{python_sitelib}/django/contrib/contenttypes/migrations
%{python_sitelib}/django/contrib/contenttypes/*.py*
+%{python_sitelib}/django/contrib/contenttypes/tests
%dir %{python_sitelib}/django/contrib/flatpages/
%dir %{python_sitelib}/django/contrib/flatpages/locale/
%dir %{python_sitelib}/django/contrib/flatpages/locale/??/
@@ -298,6 +293,7 @@ popd
%dir %{python_sitelib}/django/contrib/flatpages/locale/*/LC_MESSAGES
%{python_sitelib}/django/contrib/flatpages/*.py*
%{python_sitelib}/django/contrib/flatpages/fixtures/
+%{python_sitelib}/django/contrib/flatpages/migrations/
%{python_sitelib}/django/contrib/flatpages/templatetags
%{python_sitelib}/django/contrib/flatpages/tests
%dir %{python_sitelib}/django/contrib/formtools/
@@ -336,12 +332,14 @@ popd
%dir %{python_sitelib}/django/contrib/redirects/locale/??_*/
%dir %{python_sitelib}/django/contrib/redirects/locale/*/LC_MESSAGES
%{python_sitelib}/django/contrib/redirects/*.py*
+%{python_sitelib}/django/contrib/redirects/migrations
%dir %{python_sitelib}/django/contrib/sessions/
%dir %{python_sitelib}/django/contrib/sessions/locale/
%dir %{python_sitelib}/django/contrib/sessions/locale/??/
%dir %{python_sitelib}/django/contrib/sessions/locale/??_*/
%dir %{python_sitelib}/django/contrib/sessions/locale/*/LC_MESSAGES
%{python_sitelib}/django/contrib/sessions/management/
+%{python_sitelib}/django/contrib/sessions/migrations/
%{python_sitelib}/django/contrib/sessions/*.py*
%{python_sitelib}/django/contrib/sitemaps/
%dir %{python_sitelib}/django/contrib/sites/
@@ -350,6 +348,7 @@ popd
%dir %{python_sitelib}/django/contrib/sites/locale/??_*/
%dir %{python_sitelib}/django/contrib/sites/locale/*/LC_MESSAGES
%{python_sitelib}/django/contrib/sites/*.py*
+%{python_sitelib}/django/contrib/sites/migrations
%{python_sitelib}/django/contrib/staticfiles/
%{python_sitelib}/django/contrib/syndication/
%{python_sitelib}/django/contrib/webdesign/
@@ -398,24 +397,16 @@ popd
%{_bindir}/python3-django-admin
# as said before, manpages are owned by both python2 and python3 packages
%exclude %{_mandir}/man1/django-admin.1*
-%exclude %{_mandir}/man1/daily_cleanup.1.*
%exclude %{_mandir}/man1/gather_profile_stats.1.*
-%{_mandir}/man1/python3-daily_cleanup.1.*
%{_mandir}/man1/python3-django-admin.1.*
%{_mandir}/man1/python3-gather_profile_stats.1.*
-%attr(0755,root,root) %{python3_sitelib}/django/bin/*-messages.py*
-%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 %{python3_sitelib}/django/bin/profiling/
-%attr(0755,root,root) %{python3_sitelib}/django/bin/profiling/gather_profile_stats.py
# Include everything but the locale data ...
%dir %{python3_sitelib}/django
%dir %{python3_sitelib}/django/bin
-%{python3_sitelib}/django/bin/profiling/__init__.py*
+%{python3_sitelib}/django/apps
%{python3_sitelib}/django/db/
%{python3_sitelib}/django/*.py*
-%{python3_sitelib}/django/shortcuts/
%{python3_sitelib}/django/utils/
%{python3_sitelib}/django/dispatch/
%{python3_sitelib}/django/template/
@@ -433,8 +424,7 @@ popd
%dir %{python3_sitelib}/django/contrib/admin/locale/??_*/
%dir %{python3_sitelib}/django/contrib/admin/locale/*/LC_MESSAGES
%{python3_sitelib}/django/contrib/admin/*.py*
-%dir %{python3_sitelib}/django/contrib/admin/bin/
-%attr(0755,root,root) %{python3_sitelib}/django/contrib/admin/bin/compress.py
+%{python3_sitelib}/django/contrib/admin/migrations
%{python3_sitelib}/django/contrib/admin/views/
%{python3_sitelib}/django/contrib/admin/static/
%{python3_sitelib}/django/contrib/admin/templatetags/
@@ -456,6 +446,7 @@ popd
%{python3_sitelib}/django/contrib/auth/fixtures/
%{python3_sitelib}/django/contrib/auth/handlers/
%{python3_sitelib}/django/contrib/auth/management/
+%{python3_sitelib}/django/contrib/auth/migrations/
%{python3_sitelib}/django/contrib/auth/templates/
%{python3_sitelib}/django/contrib/auth/tests/
%dir %{python3_sitelib}/django/contrib/comments/
@@ -473,6 +464,8 @@ popd
%dir %{python3_sitelib}/django/contrib/contenttypes/locale/??_*/
%dir %{python3_sitelib}/django/contrib/contenttypes/locale/*/LC_MESSAGES
%{python3_sitelib}/django/contrib/contenttypes/*.py*
+%{python3_sitelib}/django/contrib/contenttypes/migrations/
+%{python3_sitelib}/django/contrib/contenttypes/tests/
%dir %{python3_sitelib}/django/contrib/flatpages/
%dir %{python3_sitelib}/django/contrib/flatpages/locale/
%dir %{python3_sitelib}/django/contrib/flatpages/locale/??/
@@ -480,6 +473,7 @@ popd
%dir %{python3_sitelib}/django/contrib/flatpages/locale/*/LC_MESSAGES
%{python3_sitelib}/django/contrib/flatpages/*.py*
%{python3_sitelib}/django/contrib/flatpages/fixtures/
+%{python3_sitelib}/django/contrib/flatpages/migrations
%{python3_sitelib}/django/contrib/flatpages/templatetags
%{python3_sitelib}/django/contrib/flatpages/tests
%dir %{python3_sitelib}/django/contrib/formtools/
@@ -518,12 +512,14 @@ popd
%dir %{python3_sitelib}/django/contrib/redirects/locale/??_*/
%dir %{python3_sitelib}/django/contrib/redirects/locale/*/LC_MESSAGES
%{python3_sitelib}/django/contrib/redirects/*.py*
+%{python3_sitelib}/django/contrib/redirects/migrations
%dir %{python3_sitelib}/django/contrib/sessions/
%dir %{python3_sitelib}/django/contrib/sessions/locale/
%dir %{python3_sitelib}/django/contrib/sessions/locale/??/
%dir %{python3_sitelib}/django/contrib/sessions/locale/??_*/
%dir %{python3_sitelib}/django/contrib/sessions/locale/*/LC_MESSAGES
%{python3_sitelib}/django/contrib/sessions/management/
+%{python3_sitelib}/django/contrib/sessions/migrations/
%{python3_sitelib}/django/contrib/sessions/*.py*
%{python3_sitelib}/django/contrib/sitemaps/
%dir %{python3_sitelib}/django/contrib/sites/
@@ -532,6 +528,7 @@ popd
%dir %{python3_sitelib}/django/contrib/sites/locale/??_*/
%dir %{python3_sitelib}/django/contrib/sites/locale/*/LC_MESSAGES
%{python3_sitelib}/django/contrib/sites/*.py*
+%{python3_sitelib}/django/contrib/sites/migrations
%{python3_sitelib}/django/contrib/staticfiles/
%{python3_sitelib}/django/contrib/syndication/
%{python3_sitelib}/django/contrib/webdesign/
@@ -565,12 +562,12 @@ popd
%{python3_sitelib}/%{pkgname}-%{version}-py3.?.egg-info
%{python3_sitelib}/django/__pycache__
%{python3_sitelib}/django/bin/__pycache__
-%{python3_sitelib}/django/bin/profiling/__pycache__
+#%{python3_sitelib}/django/bin/profiling/__pycache__
%{python3_sitelib}/django/conf/__pycache__
%{python3_sitelib}/django/conf/locale/*/__pycache__
%{python3_sitelib}/django/contrib/__pycache__
%{python3_sitelib}/django/contrib/admin/__pycache__
-%{python3_sitelib}/django/contrib/admin/bin/__pycache__
+#%{python3_sitelib}/django/contrib/admin/bin/__pycache__
%{python3_sitelib}/django/contrib/admindocs/__pycache__
%{python3_sitelib}/django/contrib/auth/__pycache__
%{python3_sitelib}/django/contrib/comments/__pycache__
@@ -587,6 +584,9 @@ popd
%changelog
+* Fri Oct 17 2014 Matthias Runge <mrunge at redhat.com> - 1.7-1
+- update to 1.7 (rhbz#1132877)
+
* Thu Sep 25 2014 Matthias Runge <mrunge at redhat.com> - 1.6.7-1
- update to 1.6.7
- don't own bash-completion dir.
diff --git a/sources b/sources
index af449d3..9e3368a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f31e2f953feb258e3569e962790630b6 Django-1.6.7.tar.gz
+03edab6828119aa9b32b2252d25eb38d Django-1.7.tar.gz
More information about the scm-commits
mailing list