rpms/TurboGears/EL-5 turbogears-sqlcreate.patch, NONE, 1.1 TurboGears.spec, 1.27, 1.28

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9395/EL-5

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/EL-5/TurboGears.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- TurboGears.spec	17 Aug 2009 20:56:28 -0000	1.27
+++ TurboGears.spec	1 Dec 2009 02:10:17 -0000	1.28
@@ -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
 
@@ -114,24 +120,57 @@ rm -rf %{buildroot}
 * Sat May 2 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-3
 - Fix from upstream for pagination problem.
 
-* Sat Mar 07 2009 Luke Macken <lmacken at redhat.com> 1.0.8-3
-- Update our setup.py patch to work with the 0.9 branch of SQLObject
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 03 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-1
+- Latest upstream release.
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.0.7-3
+- Rebuild for Python 2.6
 
-* Tue Mar 3 2009 Toshio Kuratomi <toshio at fedoraproject.org> 1.0.8-2
-- Add the correct patches to cvs
+* Wed Sep 17 2008 Luke Macken <lmacken at redhat.com> 1.0.7-2
+- Add a patch to allow newer versions of TurboJson
 
-* Tue Mar 3 2009 Toshio Kuratomi <toshio at fedoraproject.org> 1.0.8-1
-- 1.0.8 release
-- Remove ez_setup from setup.py so setup will run with lesser setuptools.
+* Tue Sep 16 2008 Luke Macken <lmacken at redhat.com> 1.0.7-1
+- Update to the latest upstream release
+- Utilize the test suite
+- Remove the setup.py patch
 
-* Mon Aug 18 2008 Luke Macken <lmacken at redhat.com> 1.0.4.4-2
-- Make our SQLObject requirement less strict, to match the latest TG upstream.
-  Fixes bug #459268.
+* Tue May 27 2008 Luke Macken <lmacken at redhat.com> 1.0.4.4-3
+- Patch our setup.py to remove the hard version requirements for SQLObject.
+  This has changed upstream as well.
 
-* Wed May 14 2008 Luke Macken <lmacken at redhat.com> 1.0.4.4-1
+* Tue Mar 11 2008 Luke Macken <lmacken at redhat.com> 1.0.4.4-2
+- Add TurboGears-1.0.4.4-cherrypyreq.patch to explicitly require the
+  appropriate version of CherryPy when necessary.
+
+* Fri Mar  7 2008 Luke Macken <lmacken at redhat.com> 1.0.4.4-1
 - Update to 1.0.4.4
-- Remove now upstream paginate patch
-- Add cherrypyreq patch
+- Remove the setuptools and sqlalchemy-backport patches
+
+* Fri Feb 29 2008 Luke Macken <lmacken at redhat.com> 1.0.4.3-3
+- Require python-paste-script >= 1.6.2 (Bug #435525)
+
+* Thu Feb 21 2008 Toshio Kuratomi <tkuratom at redhat.com> 1.0.4.3-2
+- Fixes for SQLAlchemy-0.4 and exceptions.  Upstream Bug #1721.
+
+* Fri Feb  1 2008 Luke Macken <lmacken at redhat.com> 1.0.4.3-1
+- 1.0.4.3
+
+* Sat Jan 26 2008 Luke Macken <lmacken at redhat.com> 1.0.4.2-3
+- Require Genshi and Elixir
+
+* Wed Jan 23 2008 Luke Macken <lmacken at redhat.com> 1.0.4.2-2
+- Update setuptools patch to work with the CherryPy egg_info
+
+* Tue Jan 22 2008 Luke Macken <lmacken at redhat.com> 1.0.4.2-1
+- 1.0.4.2
+
+* Sun Jan 20 2008 Luke Macken <lmacken at redhat.com> 1.0.4-1
+- 1.0.4
+- Remove paginate patch
+- Update setuptools patch
 
 * Sat Dec 15 2007 Luke Macken <lmacken at redhat.com> 1.0.3.2-7
 - Add TurboGears-1.0.3.2-paginate.patch backported from upstream