rpms/python-sqlobject/F-8 python-sqlobject-0.9.6-setup.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 python-sqlobject.spec, 1.15, 1.16 sources, 1.9, 1.10

[Luke Macken (lmacken)]

Author: lmacken

Update of /cvs/pkgs/rpms/python-sqlobject/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25922

Modified Files:
	.cvsignore python-sqlobject.spec sources 
Added Files:
	python-sqlobject-0.9.6-setup.patch 
Log Message:
* Tue May 20 2008 Luke Macken <lmacken at redhat.com> - 0.9.6-1
- Update to latest 0.9 release
- Add python-sqlobject-0.9.6-setup.patch so we don't pull in our own setuptools


python-sqlobject-0.9.6-setup.patch:

--- NEW FILE python-sqlobject-0.9.6-setup.patch ---
--- setup.py.orig	2008-05-20 18:48:49.000000000 -0400
+++ setup.py	2008-05-20 18:48:53.000000000 -0400
@@ -1,8 +1,6 @@
 # ez_setup doesn't work with Python 2.2, so we use distutils
 # in that case:
 try:
-    from ez_setup import use_setuptools
-    use_setuptools()
     from setuptools import setup
     is_setuptools = True
 except ImportError:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlobject/F-8/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	21 Feb 2008 21:40:36 -0000	1.9
+++ .cvsignore	20 May 2008 23:03:04 -0000	1.10
@@ -1 +1 @@
-SQLObject-0.9.3.tar.gz
+SQLObject-0.9.6.tar.gz


Index: python-sqlobject.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlobject/F-8/python-sqlobject.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- python-sqlobject.spec	21 Feb 2008 21:40:36 -0000	1.15
+++ python-sqlobject.spec	20 May 2008 23:03:04 -0000	1.16
@@ -1,14 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-sqlobject
-Version:        0.9.3
-Release:        2%{?dist}
+Version:        0.9.6
+Release:        1%{?dist}
 Summary:        SQLObject -Object-Relational Manager, aka database wrapper  
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://sqlobject.org/
 Source0:        http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-%{version}.tar.gz  
+Patch0:         %{name}-%{version}-setup.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q -n SQLObject-%{version}
+%patch0 -b .setup
 
 %build
 %{__python} setup.py build
@@ -50,6 +52,10 @@
 %{_bindir}/*
 
 %changelog
+* Tue May 20 2008 Luke Macken <lmacken at redhat.com> - 0.9.6-1
+- Update to latest 0.9 release
+- Add python-sqlobject-0.9.6-setup.patch so we don't pull in our own setuptools
+
 * Thu Feb 21 2008 Toshio Kuratomi <tkuratom at redhat.com> 0.9.3-2
 - Stop deleting the ez_setup directory so we can build setuptools eggs as
   upstream intends.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlobject/F-8/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Feb 2008 21:40:36 -0000	1.9
+++ sources	20 May 2008 23:03:04 -0000	1.10
@@ -1 +1 @@
-c0e00600ced0ef7949a4232e6bd4db2c  SQLObject-0.9.3.tar.gz
+4c5a729cfc4b31e2e5f4d7ee9976bc70  SQLObject-0.9.6.tar.gz