- up to version 0.7.0

Changed files:
    python-SQLObject-disable-setuptools.patch -> 1.1
    python-SQLObject.spec -> 1.6

diff --git a/python-SQLObject-disable-setuptools.patch b/python-SQLObject-disable-setuptools.patch
new file mode 100644 (file)
index 0000000..eadf63b
--- /dev/null
+++ b/python-SQLObject-disable-setuptools.patch
@@ -0,0 +1,33 @@
+diff -Naur SQLObject-0.7.0.orig/scripts/sqlobject-admin SQLObject-0.7.0/scripts/sqlobject-admin
+--- SQLObject-0.7.0.orig/scripts/sqlobject-admin       2005-10-02 00:59:35.000000000 +0200
++++ SQLObject-0.7.0/scripts/sqlobject-admin    2005-10-23 23:02:38.000000000 +0200
+@@ -3,13 +3,6 @@
+ import os
+ 
+ try:
+-    import pkg_resources
+-    pkg_resources.require('SQLObject>0.6.1')
+-except (ImportError, pkg_resources.DistributionNotFound):
+-    # Oh well, we tried...
+-    pass
+-
+-try:
+     import sqlobject.manager
+ except ImportError:
+     try:
+diff -Naur SQLObject-0.7.0.orig/setup.py SQLObject-0.7.0/setup.py
+--- SQLObject-0.7.0.orig/setup.py      2005-10-02 00:59:54.000000000 +0200
++++ SQLObject-0.7.0/setup.py   2005-10-23 23:03:40.000000000 +0200
+@@ -1,11 +1,4 @@
+-# 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
+-except ImportError:
+-    from distutils.core import setup
++from distutils.core import setup
+ 
+ subpackages = ['firebird', 'inheritance', 'mysql', 'postgres',
+                'sqlite', 'sybase', 'maxdb', 'util', 'manager']

diff --git a/python-SQLObject.spec b/python-SQLObject.spec
index ce27a0e70431ee8ae9e2779dc8ce83b427e6c1ea..fe6610258830fc51c7210d2e1f4ba303f6151713 100644 (file)
--- a/python-SQLObject.spec
+++ b/python-SQLObject.spec
@@ -5,16 +5,18 @@
 Summary:       Object-Relational Manager, aka database wrapper
 Summary(pl):   Zarz±dca obiektowo-relacyjny, czyli wrapper dla baz danych
 Name:          python-%{module}
-Version:       0.6.1
+Version:       0.7.0
 Release:       1
 License:       LGPL
 Vendor:                Ian Bicking <ianb@colorstudy.com>
 Group:         Development/Languages/Python
-Source0:       http://dl.sourceforge.net/sqlobject/%{module}-%{version}.tar.gz
-# Source0-md5: 0dbb6ea429aa40eee734751ad48fbfbb
+Source0:       http://cheeseshop.python.org/packages/source/S/%{module}/%{module}-%{version}.tar.gz
+# Source0-md5: dccb921b5df6a15312b56630ac4ac205
+Patch0:                %{name}-disable-setuptools.patch
 URL:           http://sqlobject.org
 BuildRequires: python-devel >= 1:2.3
 %pyrequires_eq python-modules
+Requires:      python-FormEncode >= 0.2.2
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -32,8 +34,10 @@ PostgreSQL-em, SQLite, Firebirdem.
 
 %prep
 %setup -q -n %{module}-%{version}
+%patch0 -p1
 
 %build
+rm -rf ez_setup
 python setup.py build
 
 %install
@@ -50,5 +54,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README.txt PKG-INFO docs examples
+%doc README.txt PKG-INFO docs 
+%attr(755,root,root) %{_bindir}/*
 %{py_sitescriptdir}/%{_module}