rpms/Django/devel .cvsignore, 1.16, 1.17 Django.spec, 1.36, 1.37 sources, 1.16, 1.17

[smilner]

Author: smilner

Update of /cvs/pkgs/rpms/Django/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20112

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
added patch from BZ601212


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	25 May 2010 19:16:51 -0000	1.16
+++ .cvsignore	8 Jun 2010 17:54:00 -0000	1.17
@@ -1 +1,2 @@
 Django-1.2.1.tar.gz
+Django-hash-compat-13310.patch


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/Django.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- Django.spec	4 Jun 2010 01:13:21 -0000	1.36
+++ Django.spec	8 Jun 2010 17:54:00 -0000	1.37
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.2.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -12,6 +12,7 @@ URL:            http://www.djangoproject
 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
@@ -54,6 +55,7 @@ Python Web framework.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p3
 # remove bundled simplejson
 cd django/utils/simplejson/
 rm -rf *
@@ -154,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun  8 2010 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.2.1-5
+- Added http://code.djangoproject.com/changeset/13310?format=diff&new=13310 per BZ#601212
+
 * Thu Jun  3 2010 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.2.1-4
 - Include egg in >= rhel6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	25 May 2010 19:16:52 -0000	1.16
+++ sources	8 Jun 2010 17:54:01 -0000	1.17
@@ -1 +1,2 @@
 2351efb20f6b7b5d9ce80fa4cb1bd9ca  Django-1.2.1.tar.gz
+2a1c7f6ffea424b82e250b66c8de6bb9  Django-hash-compat-13310.patch