[Django] update for CVE-2010-3082

[smilner]

commit 7ff04c2a057e3a2b2f9990b60b4af99ea73adbd0
Author: Steve 'Ashcrow' Milner <smilner at redhat.com>
Date:   Thu Sep 9 10:13:47 2010 -0400

    update for CVE-2010-3082

 .gitignore  |    2 ++
 Django.spec |   10 ++++++----
 sources     |    4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 57c260f..d5ceec0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 Django-1.2.1.tar.gz
 Django-hash-compat-13310.patch
+/Django-1.2.2.tar.gz
+/simplejson-init.py
diff --git a/Django.spec b/Django.spec
index ac91474..992c12d 100644
--- a/Django.spec
+++ b/Django.spec
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           Django
-Version:        1.2.1
-Release:        6%{?dist}
+Version:        1.2.2
+Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -12,7 +12,6 @@ URL:            http://www.djangoproject.com/
 Source0:        http://media.djangoproject.com/releases/%{version}/Django-%{version}.tar.gz
 # stub simplejson module that imports the system version
 Source1:        simplejson-init.py
-Patch0:         Django-hash-compat-13310.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -55,7 +54,6 @@ Python Web framework.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p3
 # remove bundled simplejson
 cd django/utils/simplejson/
 rm -rf *
@@ -156,6 +154,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep  9 2010 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.2.2-1
+- Update for CVE-2010-3082 (see http://www.djangoproject.com/weblog/2010/sep/08/security-release/)
+- Removed Django-hash-compat-13310.patch as it is already included in this release
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 1.2.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
diff --git a/sources b/sources
index 129ca4a..b154a04 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2351efb20f6b7b5d9ce80fa4cb1bd9ca  Django-1.2.1.tar.gz
-2a1c7f6ffea424b82e250b66c8de6bb9  Django-hash-compat-13310.patch
+9cdbf79a31988ace9ef2ab4ede890136  Django-1.2.2.tar.gz
+5fe0cb83b3122ec27d1179cb9a39063b  simplejson-init.py