[python-django] revert my last change. looking for other solution

Matthias Runge mrunge at fedoraproject.org
Tue Mar 27 12:22:32 UTC 2012


commit 87a3a9f189e3981f884a694faf8740417f092376
Author: Matthias Runge <mrunge at matthias-runge.de>
Date:   Tue Mar 27 14:22:12 2012 +0200

    revert my last change. looking for other solution

 python-django.spec |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/python-django.spec b/python-django.spec
index f258034..0f084ed 100644
--- a/python-django.spec
+++ b/python-django.spec
@@ -15,14 +15,13 @@
 
 Name:           python-django
 Version:        1.4
-Release:        2%{?dist}
+Release:        3%{?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
@@ -92,10 +91,10 @@ done
 echo "<!-- nothing -->" > django/contrib/flatpages/tests/templates/registration/login.html
 
 # remove bundled simplejson (for tests)
-cd django/utils/simplejson
-rm -rf *
-# and put the replacement stub in place
-cp -p %{SOURCE1} __init__.py
+cd django/utils
+rm -rf simplejson
+# and link to system module
+ln -s %{python_sitearch}/simplejson .
 
 
 
@@ -260,6 +259,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Mar 27 2012 Matthias Runge <mrunge at matthias-runge.de> - 1.4-3
+- revert change from 1.4-2
+
 * Tue Mar 27 2012 Matthias Runge <mrunge at matthias-runge.de> - 1.4-2
 - fix simplejson-import (port from django-1.3-package)
 


More information about the scm-commits mailing list