rpms/Django/devel .cvsignore, 1.13, 1.14 Django-ignore-pyo-bz-495046.patch, 1.1, 1.2 Django.spec, 1.29, 1.30 sources, 1.13, 1.14

[smilner]

Author: smilner

Update of /cvs/pkgs/rpms/Django/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17333

Modified Files:
	.cvsignore Django-ignore-pyo-bz-495046.patch Django.spec 
	sources 
Log Message:
proposed update for fix for http://www.djangoproject.com/weblog/2009/oct/09/security/


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	2 Aug 2009 00:35:26 -0000	1.13
+++ .cvsignore	10 Oct 2009 00:52:08 -0000	1.14
@@ -1,3 +1,2 @@
-Django-1.1.tar.gz
-Django-ignore-pyo-bz-495046.patch
 simplejson-init.py
+Django-1.1.1.tar.gz

Django-ignore-pyo-bz-495046.patch:
 base.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: Django-ignore-pyo-bz-495046.patch
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/Django-ignore-pyo-bz-495046.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Django-ignore-pyo-bz-495046.patch	2 Aug 2009 00:35:26 -0000	1.1
+++ Django-ignore-pyo-bz-495046.patch	10 Oct 2009 00:52:09 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ur Django-1.1.old/django/core/management/base.py Django-1.1/django/core/management/base.py
---- Django-1.1.old/django/core/management/base.py	2009-08-01 19:57:57.326706120 -0400
-+++ Django-1.1/django/core/management/base.py	2009-08-01 19:58:19.706707008 -0400
+diff -ur Django-1.1.1.old/django/core/management/base.py Django-1.1.1/django/core/management/base.py
+--- Django-1.1.1.old/django/core/management/base.py	2009-08-01 19:57:57.326706120 -0400
++++ Django-1.1.1/django/core/management/base.py	2009-08-01 19:58:19.706707008 -0400
 @@ -398,7 +398,7 @@
              if subdir.startswith('.'):
                  del subdirs[i]


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/Django.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- Django.spec	26 Aug 2009 22:17:45 -0000	1.29
+++ Django.spec	10 Oct 2009 00:52:09 -0000	1.30
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           Django
-Version:        1.1
-Release:        4%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -12,7 +12,6 @@ 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-ignore-pyo-bz-495046.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -46,7 +45,6 @@ Python Web framework.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
 # remove bundled simplejson
 cd django/utils/simplejson/
 rm -rf *
@@ -112,7 +110,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/_build/html/*
 %endif
 
+
 %changelog
+* Fri Oct  9 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1.1-1
+- Update to fix http://www.djangoproject.com/weblog/2009/oct/09/security/
+- Django-ignore-pyo-bz-495046.patch no longer needed.
+
 * Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-4
 - EL-4 shouldn't get the sphinx docs.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	2 Aug 2009 00:35:26 -0000	1.13
+++ sources	10 Oct 2009 00:52:09 -0000	1.14
@@ -1,3 +1,2 @@
-b2d75b4457a39c405fa2b36bf826bf6b  Django-1.1.tar.gz
-302eb7b98d32ae67ade4ebdaff3bf361  Django-ignore-pyo-bz-495046.patch
 5fe0cb83b3122ec27d1179cb9a39063b  simplejson-init.py
+d7839c192e115f9c4dd8777de24dc21c  Django-1.1.1.tar.gz