[python-django] update to 1.6 (rhbz#1027766)

[Matej Cepl]

commit ebe1274387ac79e840c4e79e605573753ecd165e
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Sun Nov 24 21:40:40 2013 +0100

    update to 1.6 (rhbz#1027766)

 .gitignore                                         |    1 +
 ...-Removed-an-HTMLParser-test-that-doesn-t-.patch |   28 ------------
 Django-1.4-no-internet-connection-tests.patch      |   43 -------------------
 Django-1.4-relax-scalability-req.patch             |   11 -----
 python-django-1.5-docutils.patch                   |   33 --------------
 python-django.spec                                 |   45 ++++----------------
 sources                                            |    2 +-
 7 files changed, 10 insertions(+), 153 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 73084d1..e98e414 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /Django-1.5.3.tar.gz
 /Django-1.5.4.tar.gz
 /Django-1.5.5.tar.gz
+/Django-1.6.tar.gz
diff --git a/python-django.spec b/python-django.spec
index df7e278..da29896 100644
--- a/python-django.spec
+++ b/python-django.spec
@@ -13,11 +13,11 @@
 
 # one higher than the last Django release, to account for
 # dist tags
-%global         obs_ver 1.4.10-1
+%global         obs_ver 1.5.5-3
 
 Name:           python-django
-Version:        1.5.5
-Release:        2%{?dist}
+Version:        1.6
+Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -25,9 +25,6 @@ License:        BSD
 URL:            http://www.djangoproject.com/
 Source0:        http://pypi.python.org/packages/source/D/Django/Django-%{version}.tar.gz
 
-# patch tests to skip tests requiring internet connection
-Patch0:         python-django-1.5-fix-tests.patch
-
 BuildArch:      noarch
 # Note: No longer required in development version > 0.95
 # BuildRequires:  python-setuptools
@@ -99,11 +96,9 @@ principle.
 
 %prep
 %setup -q -n %{pkgname}-%{version}
-%patch0
 
 # empty files
 for f in \
-    django/contrib/markup/models.py \
     django/contrib/staticfiles/models.py \
     django/contrib/webdesign/models.py \
     django/contrib/humanize/models.py \
@@ -277,10 +272,6 @@ popd
 %dir %{python_sitelib}/django/contrib/contenttypes/locale/??_*/
 %dir %{python_sitelib}/django/contrib/contenttypes/locale/*/LC_MESSAGES
 %{python_sitelib}/django/contrib/contenttypes/*.py*
-%dir %{python_sitelib}/django/contrib/databrowse/
-%{python_sitelib}/django/contrib/databrowse/plugins
-%{python_sitelib}/django/contrib/databrowse/templates
-%{python_sitelib}/django/contrib/databrowse/*.py*
 %dir %{python_sitelib}/django/contrib/flatpages/
 %dir %{python_sitelib}/django/contrib/flatpages/locale/
 %dir %{python_sitelib}/django/contrib/flatpages/locale/??/
@@ -313,14 +304,6 @@ popd
 %dir %{python_sitelib}/django/contrib/humanize/locale/*/LC_MESSAGES
 %{python_sitelib}/django/contrib/humanize/templatetags/
 %{python_sitelib}/django/contrib/humanize/*.py*
-%dir %{python_sitelib}/django/contrib/localflavor
-%dir %{python_sitelib}/django/contrib/localflavor/??/
-%dir %{python_sitelib}/django/contrib/localflavor/??_/
-%{python_sitelib}/django/contrib/localflavor/*.py*
-%{python_sitelib}/django/contrib/localflavor/??/*.py*
-%{python_sitelib}/django/contrib/localflavor/??_/*.py*
-%{python_sitelib}/django/contrib/localflavor/generic
-%{python_sitelib}/django/contrib/markup
 %dir %{python_sitelib}/django/contrib/messages/
 %dir %{python_sitelib}/django/contrib/messages/locale
 %dir %{python_sitelib}/django/contrib/messages/locale/??/
@@ -360,6 +343,7 @@ popd
 %{python_sitelib}/django/contrib/gis/management/
 %{python_sitelib}/django/contrib/gis/maps/
 %{python_sitelib}/django/contrib/gis/sitemaps/
+%{python_sitelib}/django/contrib/gis/static/gis/js/OLMapWidget.js
 %{python_sitelib}/django/contrib/gis/templates/
 %{python_sitelib}/django/contrib/gis/tests/
 %{python_sitelib}/django/contrib/gis/utils/
@@ -380,7 +364,6 @@ popd
 
 %{python_sitelib}/*.egg-info
 
-
 %files doc
 %doc docs/_build/html/*
 
@@ -470,10 +453,6 @@ popd
 %dir %{python3_sitelib}/django/contrib/contenttypes/locale/??_*/
 %dir %{python3_sitelib}/django/contrib/contenttypes/locale/*/LC_MESSAGES
 %{python3_sitelib}/django/contrib/contenttypes/*.py*
-%dir %{python3_sitelib}/django/contrib/databrowse/
-%{python3_sitelib}/django/contrib/databrowse/plugins
-%{python3_sitelib}/django/contrib/databrowse/templates
-%{python3_sitelib}/django/contrib/databrowse/*.py*
 %dir %{python3_sitelib}/django/contrib/flatpages/
 %dir %{python3_sitelib}/django/contrib/flatpages/locale/
 %dir %{python3_sitelib}/django/contrib/flatpages/locale/??/
@@ -506,14 +485,6 @@ popd
 %dir %{python3_sitelib}/django/contrib/humanize/locale/*/LC_MESSAGES
 %{python3_sitelib}/django/contrib/humanize/templatetags/
 %{python3_sitelib}/django/contrib/humanize/*.py*
-%dir %{python3_sitelib}/django/contrib/localflavor
-%dir %{python3_sitelib}/django/contrib/localflavor/??/
-%dir %{python3_sitelib}/django/contrib/localflavor/??_/
-%{python3_sitelib}/django/contrib/localflavor/*.py*
-%{python3_sitelib}/django/contrib/localflavor/??/*.py*
-%{python3_sitelib}/django/contrib/localflavor/??_/*.py*
-%{python3_sitelib}/django/contrib/localflavor/generic
-%{python3_sitelib}/django/contrib/markup
 %dir %{python3_sitelib}/django/contrib/messages/
 %dir %{python3_sitelib}/django/contrib/messages/locale
 %dir %{python3_sitelib}/django/contrib/messages/locale/??/
@@ -553,6 +524,7 @@ popd
 %{python3_sitelib}/django/contrib/gis/management/
 %{python3_sitelib}/django/contrib/gis/maps/
 %{python3_sitelib}/django/contrib/gis/sitemaps/
+%{python3_sitelib}/django/contrib/gis/static/gis/js/OLMapWidget.js
 %{python3_sitelib}/django/contrib/gis/templates/
 %{python3_sitelib}/django/contrib/gis/tests/
 %{python3_sitelib}/django/contrib/gis/utils/
@@ -583,14 +555,10 @@ popd
 %{python3_sitelib}/django/contrib/auth/__pycache__
 %{python3_sitelib}/django/contrib/comments/__pycache__
 %{python3_sitelib}/django/contrib/contenttypes/__pycache__
-%{python3_sitelib}/django/contrib/databrowse/__pycache__
 %{python3_sitelib}/django/contrib/flatpages/__pycache__
 %{python3_sitelib}/django/contrib/formtools/__pycache__
 %{python3_sitelib}/django/contrib/gis/__pycache__
 %{python3_sitelib}/django/contrib/humanize/__pycache__
-%{python3_sitelib}/django/contrib/localflavor/__pycache__
-%{python3_sitelib}/django/contrib/localflavor/??/__pycache__
-%{python3_sitelib}/django/contrib/localflavor/??_/__pycache__
 %{python3_sitelib}/django/contrib/messages/__pycache__
 %{python3_sitelib}/django/contrib/redirects/__pycache__
 %{python3_sitelib}/django/contrib/sessions/__pycache__
@@ -599,6 +567,9 @@ popd
 
 
 %changelog
+* Sun Nov 24 2013 Matěj Cepl <mcepl at redhat.com> - 1.6-1
+- update to 1.6 (rhbz#1027766)
+
 * Tue Oct 29 2013 Matthias Runge <mrunge at redhat.com> - 1.5.5-2
 - fix obsoletes
 
diff --git a/sources b/sources
index 6030559..11e43be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e33355ee4bb2cbb4ab3954d3dff5eddd  Django-1.5.5.tar.gz
+65db1bc313124c3754c89073942e38a8  Django-1.6.tar.gz