rpms/python-sqlobject/FC-5 python-sqlobject-0.7.0-pkg_resources.patch, NONE, 1.1 python-sqlobject.spec, 1.3, 1.4
Luke Macken (lmacken)
fedora-extras-commits at redhat.com
Sun Jul 9 16:30:58 UTC 2006
Author: lmacken
Update of /cvs/extras/rpms/python-sqlobject/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28067/FC-5
Modified Files:
python-sqlobject.spec
Added Files:
python-sqlobject-0.7.0-pkg_resources.patch
Log Message:
* Sun Jun 9 2006 Luke Macken <lmacken at redhat.com> 0.7.0-6
- Add python-sqlobject-0.7.0-pkg_resources.patch (Bug #195548)
- Remove unnecessary python-abi requirement
python-sqlobject-0.7.0-pkg_resources.patch:
--- NEW FILE python-sqlobject-0.7.0-pkg_resources.patch ---
--- sqlobject/manager/command.py.orig 2006-06-15 13:59:05.000000000 -0400
+++ sqlobject/manager/command.py 2006-06-15 13:59:19.000000000 -0400
@@ -423,7 +423,7 @@
def config_from_egg(self, egg_spec, warn_no_sqlobject=True):
import pkg_resources
pkg_resources.require(egg_spec)
- dist = pkg_resources.working_set.find(pkg_resources.Requirement(egg_spec))
+ dist = pkg_resources.working_set.find(pkg_resources.Requirement.parse(egg_spec))
if not dist.has_metadata('sqlobject.txt'):
if warn_no_sqlobject:
print 'No sqlobject.txt in %s egg info' % egg_spec
Index: python-sqlobject.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sqlobject/FC-5/python-sqlobject.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-sqlobject.spec 23 Oct 2005 20:11:04 -0000 1.3
+++ python-sqlobject.spec 9 Jul 2006 16:30:58 -0000 1.4
@@ -2,7 +2,7 @@
Name: python-sqlobject
Version: 0.7.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: SQLObject -Object-Relational Manager, aka database wrapper
Group: Development/Libraries
@@ -10,11 +10,12 @@
URL: http://sqlobject.org/
Source0: http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-%{version}.tar.gz
Patch0: python-sqlobject-admin.patch
+Patch1: python-sqlobject-0.7.0-pkg_resources.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
-Requires: python-sqlite, python-formencode >= 0.2.2, python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires: python-sqlite, python-formencode >= 0.2.2
%description
@@ -29,6 +30,7 @@
%setup -q -n SQLObject-%{version}
rm -rf ez_setup
%patch0 -p1
+%patch1
%build
%{__python} setup.py build
@@ -100,6 +102,10 @@
%{_bindir}/*
%changelog
+* Sun Jun 9 2006 Luke Macken <lmacken at redhat.com> 0.7.0-6
+- Add python-sqlobject-0.7.0-pkg_resources.patch (Bug #195548)
+- Remove unnecessary python-abi requirement
+
* Sun Oct 23 2005 Oliver Andrich <oliver.andrich at gmail.com> 0.7.0-5.fc4
- fixed the changelog usage of a macro
More information about the fedora-extras-commits
mailing list