[python-django] get simplejson import working again

[Matthias Runge]

commit 9ffec02c351eed90fa30597c5c5076c3fcdc441b
Author: Matthias Runge <mrunge at matthias-runge.de>
Date:   Tue Mar 27 13:49:32 2012 +0200

    get simplejson import working again

 python-django.spec |   15 ++++++++++-----
 simplejson-init.py |    5 +++++
 2 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/python-django.spec b/python-django.spec
index 59b9961..f258034 100644
--- a/python-django.spec
+++ b/python-django.spec
@@ -15,13 +15,14 @@
 
 Name:           python-django
 Version:        1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.djangoproject.com/
 Source0:        http://pypi.python.org/packages/source/D/Django/Django-%{version}.tar.gz
+Source1:        simplejson-init.py
 
 # patch tests to skip tests requiring internet connection
 Patch0:         Django-1.4-no-internet-connection-tests.patch
@@ -91,10 +92,11 @@ done
 echo "<!-- nothing -->" > django/contrib/flatpages/tests/templates/registration/login.html
 
 # remove bundled simplejson (for tests)
-cd django/utils
-rm -rf simplejson
-# and link to system module
-ln -s %{python_sitearch}/simplejson .
+cd django/utils/simplejson
+rm -rf *
+# and put the replacement stub in place
+cp -p %{SOURCE1} __init__.py
+
 
 
 %build
@@ -258,6 +260,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Mar 27 2012 Matthias Runge <mrunge at matthias-runge.de> - 1.4-2
+- fix simplejson-import (port from django-1.3-package)
+
 * Sun Mar 25 2012 Michel Salim <salimma at fedoraproject.org> - 1.4-1
 - Update to 1.4
 
diff --git a/simplejson-init.py b/simplejson-init.py
new file mode 100644
index 0000000..060b3ca
--- /dev/null
+++ b/simplejson-init.py
@@ -0,0 +1,5 @@
+"""
+Stub simplejson library that just imports the version provided by the system
+"""
+
+from simplejson import *