rpms/django-flash/EL-5 django-flash-setuptools.patch, NONE, 1.1 django-flash.spec, 1.1, 1.2

[Sebastian Dziallas]

Author: sdz

Update of /cvs/pkgs/rpms/django-flash/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1194

Modified Files:
	django-flash.spec 
Added Files:
	django-flash-setuptools.patch 
Log Message:
make django-flash compile on EL5


django-flash-setuptools.patch:
 setup.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE django-flash-setuptools.patch ---
diff -up django-flash-1.6.2/setup.py.bak django-flash-1.6.2/setup.py
--- django-flash-1.6.2/setup.py.bak	2009-10-21 10:04:44.346522702 -0700
+++ django-flash-1.6.2/setup.py	2009-10-21 10:07:16.992772274 -0700
@@ -1,10 +1,13 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-import ez_setup
-ez_setup.use_setuptools()
+try:
+    from setuptools import setup, find_packages
+except ImportError:
+    import ez_setup
+    ez_setup.use_setuptools()
+    from setuptools import setup, find_packages
 
-from setuptools import setup, find_packages
 
 setup(
     name = 'django-flash',


Index: django-flash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/django-flash/EL-5/django-flash.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- django-flash.spec	10 Oct 2009 19:16:33 -0000	1.1
+++ django-flash.spec	21 Oct 2009 17:53:35 -0000	1.2
@@ -2,17 +2,18 @@
 
 Name:           django-flash
 Version:        1.6.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Django extension to provide support for Rails-like flash
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://djangoflash.destaquenet.com/
 Source0:        http://pypi.python.org/packages/source/d/%{name}/%{name}-%{version}.tar.gz
+Patch0:         django-flash-setuptools.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  Django python-devel python-setuptools-devel
+BuildRequires:  Django python-devel python-setuptools
 Requires:       Django
 
 %description
@@ -28,6 +29,7 @@ processed, those values are removed auto
 
 %prep
 %setup -q
+%patch0 -p1 -b setup.py
 
 
 %build
@@ -51,6 +53,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Sebastian Dziallas <sebastian at when.com> - 1.6.2-3
+- add patch for python-setuptools in EL5
+- adjust setupstools BR name
+
 * Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.6.2-2
 - remove unneeeded BRs