rpms/TurboGears/F-11 turbogears-sqlcreate.patch, NONE, 1.1 TurboGears.spec, 1.46, 1.47
Toshio くらとみ
toshio at fedoraproject.org
Tue Dec 1 02:10:17 UTC 2009
Author: toshio
Update of /cvs/pkgs/rpms/TurboGears/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9395/F-11
Modified Files:
TurboGears.spec
Added Files:
turbogears-sqlcreate.patch
Log Message:
* Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-8
- Fix problem with sql create and sqlobject
turbogears-sqlcreate.patch:
base.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- NEW FILE turbogears-sqlcreate.patch ---
Index: TurboGears-1.0.8/turbogears/command/base.py
===================================================================
--- TurboGears-1.0.8.orig/turbogears/command/base.py
+++ TurboGears-1.0.8/turbogears/command/base.py
@@ -128,11 +128,15 @@ class SQL(CommandWithDB):
if not eggname or not os.path.exists(
os.path.join(eggname[0], "sqlobject.txt")):
eggname = self.fix_egginfo(eggname)
+ # Turn the egg directory name into a package name
eggname = eggname[0].replace(".egg-info", "")
+ pkgname = '-'.join(eggname.split('-')[:-2])
+ pkgversion = eggname.split('-')[-2]
+ pkgname = '%s == %s' % (pkgname, pkgversion)
if not "." in sys.path:
sys.path.append(".")
pkg_resources.working_set.add_entry(".")
- sys.argv.insert(2, eggname)
+ sys.argv.insert(2, pkgname)
sys.argv.insert(2, "--egg")
command.the_runner.run(sys.argv)
Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-11/TurboGears.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- TurboGears.spec 17 Aug 2009 20:56:28 -0000 1.46
+++ TurboGears.spec 1 Dec 2009 02:10:17 -0000 1.47
@@ -3,7 +3,7 @@
Name: TurboGears
Version: 1.0.8
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Back-to-front web development in Python
Group: Development/Languages
@@ -17,6 +17,8 @@ Patch2: %{name}-%{version}-pagin
# From upstream bug report: http://trac.turbogears.org/ticket/2348
# Going into TG-1.1 but not TG-1.0.x
Patch3: feedkid.diff
+# Reported upstream
+Patch4: turbogears-sqlcreate.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -76,6 +78,7 @@ TurboGears is easy to use for a wide ran
%patch1 -b .setup
%patch2 -p3 -b .paginate
%patch3 -p0 -b .feedkid
+%patch4 -p1 -b .sqlcreate
%build
%{__python} setup.py build
@@ -98,6 +101,9 @@ rm -rf %{buildroot}
%{python_sitelib}/turbogears/
%changelog
+* Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-8
+- Fix problem with sql create and sqlobject
+
* Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-7
- Update Requires conditionals so we can share with EPEL
More information about the fedora-extras-commits
mailing list