rpms/TurboGears/FC-5 TurboGears-0.8.9-setuptools.patch, NONE, 1.1 TurboGears.spec, 1.2, 1.3

[Luke Macken (lmacken)]

Author: lmacken

Update of /cvs/extras/rpms/TurboGears/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3555

Modified Files:
	TurboGears.spec 
Added Files:
	TurboGears-0.8.9-setuptools.patch 
Log Message:
* Thu Jul 6 2006 Luke Macken <lmacken at redhat.com> 0.8.9-2
- Add TurboGears-0.8.9-setuptools.patch



TurboGears-0.8.9-setuptools.patch:

--- NEW FILE TurboGears-0.8.9-setuptools.patch ---
--- TurboGears-0.8.9/setup.py.orig	2006-07-06 14:26:21.000000000 -0400
+++ TurboGears-0.8.9/setup.py	2006-07-06 14:26:40.000000000 -0400
@@ -35,11 +35,7 @@
 The latest development version is available in <a href="http://www.turbogears.org/svn/turbogears/trunk#egg=turbogears-dev">the TurboGears subversion repository</a>.""",
     url="http://www.turbogears.org",
     zip_safe=False,
-    install_requires = ["kid >= 0.8",
-        "CherryPy >= 2.1.1",
-        "SQLObject >= 0.7.1dev_r1457", "json-py >= 3.4",
-        "elementtree >= 1.2.6",
-        "cElementTree >= 1.0.2", "FormEncode >= 0.4",
+    install_requires = ["FormEncode >= 0.4",
         "setuptools >= 0.6a8", "TestGears >= 0.2"],
     packages=find_packages(),
     package_data = find_package_data(where='turbogears', 
--- TurboGears-0.8.9/docgen.py.orig	2006-07-06 14:26:44.000000000 -0400
+++ TurboGears-0.8.9/docgen.py	2006-07-06 14:26:51.000000000 -0400
@@ -4,7 +4,6 @@
 import time
 from setuptools import Command
 import pkg_resources
-pkg_resources.require("Kid >= 0.6.4")
 import kid
 import re
 from distutils import log
@@ -238,4 +237,4 @@
         outfile.write(masterdoc)
         outfile.close()
         self.currentfiles.add(outfn)
-        
\ No newline at end of file
+        


Index: TurboGears.spec
===================================================================
RCS file: /cvs/extras/rpms/TurboGears/FC-5/TurboGears.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurboGears.spec	6 Jul 2006 17:47:57 -0000	1.2
+++ TurboGears.spec	6 Jul 2006 18:46:38 -0000	1.3
@@ -4,13 +4,14 @@
 
 Name:           TurboGears
 Version:        0.8.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://www.turbogears.org/
 Source0:        http://www.turbogears.org/download/eggs/%{name}-%{version}.tar.gz
+Patch0:         %{name}-%{version}-setuptools.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -35,6 +36,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 find docs -type f -exec chmod a-x {} \; -exec sed -i 's/\r//g' {} \;
 
 %build
@@ -55,6 +57,9 @@
 %{python_sitelib}/turbogears
 
 %changelog
+* Thu Jul 6 2006 Luke Macken <lmacken at redhat.com> 0.8.9-2
+- Add TurboGears-0.8.9-setuptools.patch
+
 * Thu Jul 6 2006 Luke Macken <lmacken at redhat.com> 0.8.9-1
 - Bump to 0.8.9
 - Remove TurboGears-0.8a5-optim.patch and TurboGears-0.8a5-setuptools.patch