rpms/python-sqlobject/EL-5 python-sqlobject-0.9.7-setup.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 python-sqlobject.spec, 1.11, 1.12 sources, 1.5, 1.6

[Luke Macken]

Author: lmacken

Update of /cvs/pkgs/rpms/python-sqlobject/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7330

Modified Files:
	.cvsignore python-sqlobject.spec sources 
Added Files:
	python-sqlobject-0.9.7-setup.patch 
Log Message:
Update to SQLObject 0.9.7.  This include the egg-info, and fixes bug #459268

python-sqlobject-0.9.7-setup.patch:

--- NEW FILE python-sqlobject-0.9.7-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/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Nov 2007 21:24:35 -0000	1.5
+++ .cvsignore	24 Aug 2008 23:51:24 -0000	1.6
@@ -1 +1 @@
-SQLObject-0.9.2.tar.gz
+SQLObject-0.9.7.tar.gz


Index: python-sqlobject.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlobject/EL-5/python-sqlobject.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-sqlobject.spec	27 Nov 2007 21:24:35 -0000	1.11
+++ python-sqlobject.spec	24 Aug 2008 23:51:24 -0000	1.12
@@ -1,19 +1,21 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-sqlobject
-Version:        0.9.2
+Version:        0.9.7
 Release:        1%{?dist}
 Summary:        SQLObject -Object-Relational Manager, aka database wrapper  
 
 Group:          Development/Libraries
-License:        LGPL
+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
 
 BuildRequires:  python-devel
+BuildRequires:  python-setuptools-devel
 Requires:       python-sqlite2, python-formencode >= 0.2.2
 
 
@@ -27,11 +29,11 @@
 
 %prep
 %setup -q -n SQLObject-%{version}
-rm -rf ez_setup
+%patch0 -b .setup
 
 %build
 %{__python} setup.py build
-
+chmod 0644 docs/rebuild
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -46,51 +48,25 @@
 %defattr(-,root,root,-)
 %doc PKG-INFO README.txt docs
 
-%dir %{python_sitelib}/sqlobject
-%{python_sitelib}/sqlobject/*.py*
-
-%dir %{python_sitelib}/sqlobject/firebird
-%{python_sitelib}/sqlobject/firebird/*.py*
-
-%dir %{python_sitelib}/sqlobject/inheritance
-%{python_sitelib}/sqlobject/inheritance/*.py*
-
-%dir %{python_sitelib}/sqlobject/manager
-%{python_sitelib}/sqlobject/manager/*.py*
-
-%dir %{python_sitelib}/sqlobject/maxdb
-%{python_sitelib}/sqlobject/maxdb/*.py*
-
-%dir %{python_sitelib}/sqlobject/mysql
-%{python_sitelib}/sqlobject/mysql/*.py*
-
-%dir %{python_sitelib}/sqlobject/mssql
-%{python_sitelib}/sqlobject/mssql/*.py*
-
-%dir %{python_sitelib}/sqlobject/postgres
-%{python_sitelib}/sqlobject/postgres/*.py*
-
-%dir %{python_sitelib}/sqlobject/sqlite
-%{python_sitelib}/sqlobject/sqlite/*.py*
-
-%dir %{python_sitelib}/sqlobject/sybase
-%{python_sitelib}/sqlobject/sybase/*.py*
-
-%dir %{python_sitelib}/sqlobject/util
-%{python_sitelib}/sqlobject/util/*.py*
-
-%dir %{python_sitelib}/sqlobject/include
-%{python_sitelib}/sqlobject/include/*.py*
-
-%dir %{python_sitelib}/sqlobject/versioning
-%{python_sitelib}/sqlobject/versioning/__init__.py*
-
-%dir %{python_sitelib}/sqlobject/include/pydispatch
-%{python_sitelib}/sqlobject/include/pydispatch/*.py*
-
+%{python_sitelib}/*
 %{_bindir}/*
 
 %changelog
+* Thu Jun 26 2008 Luke Macken <lmacken at redhat.com> - 0.9.7-1
+- Update to 0.9.7 (fixes #459268)
+
+* 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.
+
+* Wed Feb 13 2008 Toshio Kuratomi <tkuratom at redhat.com> 0.9.3-1
+- Update to 0.9.3
+- Pick up egginfo on rawhide.
+
 * Tue Nov 27 2007 Luke Macken <lmacken at redhat.com> 0.9.2-1
 - 0.9.2
 
@@ -138,7 +114,7 @@
 * Tue Oct 13 2005 Oliver Andrich <oliver.andrich at gmail.com> 0.7.0-3
 - fixed a spelling error reported by rpmlint
 - changed the installation to use -O1
-- %ghost'ed the the resulting *.pyo files
+- %%ghost'ed the the resulting *.pyo files
 
 * Tue Oct 06 2005 Oliver Andrich <oliver.andrich at gmail.com> 0.7.0-2
 - fixed requirement for FormEncode >= 0.2.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlobject/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Nov 2007 21:24:35 -0000	1.5
+++ sources	24 Aug 2008 23:51:24 -0000	1.6
@@ -1 +1 @@
-11cdf136757fa0b3289d32e83a7ad71c  SQLObject-0.9.2.tar.gz
+72f50600c7272f6651a48e18bc70972a  SQLObject-0.9.7.tar.gz