rpms/TurboGears/devel TurboGears-1.0.2.2-setuptools.patch, 1.1, 1.2 TurboGears.spec, 1.17, 1.18

Luke Macken (lmacken) fedora-extras-commits at redhat.com
Fri May 11 07:24:11 UTC 2007


Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31063

Modified Files:
	TurboGears-1.0.2.2-setuptools.patch TurboGears.spec 
Log Message:
* Thu May 11 2007 Luke Macken <lmacken at redhat.com> 1.0.2.2-2
- Update etree patch to work with Python2.4
- Update setuptools patch


TurboGears-1.0.2.2-setuptools.patch:

Index: TurboGears-1.0.2.2-setuptools.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears-1.0.2.2-setuptools.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurboGears-1.0.2.2-setuptools.patch	5 May 2007 07:54:47 -0000	1.1
+++ TurboGears-1.0.2.2-setuptools.patch	11 May 2007 07:23:36 -0000	1.2
@@ -1,6 +1,6 @@
---- setup.py.orig	2007-05-03 12:32:20.000000000 -0400
-+++ setup.py	2007-05-03 12:32:32.000000000 -0400
-@@ -16,15 +16,13 @@
+--- setup.py.orig	2007-05-11 02:49:06.000000000 -0400
++++ setup.py	2007-05-11 02:49:30.000000000 -0400
+@@ -16,32 +16,21 @@
          "TurboJson >= 0.9.9",
          "TurboCheetah >= 0.9.5",
          "TurboKid >= 1.0.1",
@@ -8,12 +8,29 @@
          "simplejson >= 1.3",
 -        "elementtree >= 1.2.6",
          "PasteScript >= 0.9.7",
-         "FormEncode >= 0.7.1",
+-        "FormEncode >= 0.7.1",
          "setuptools >= 0.6c2",
          "RuleDispatch >= 0.5a0.dev-r2303",
          "DecoratorTools >= 1.4",
 -        "ConfigObj >= 4.3.2"]
-+]
++        ]
  tgtesttools =  ["nose >= 0.9.1", "SQLAlchemy>=0.3"]
  standard = ["SQLObject>=0.8,<0.10dev"]
  
+ # python 2.5 compatible list
+ if sys.version_info < (2, 5):
+-    install_requires.extend([
+-        "cElementTree >= 1.0.5",
+-        ])
+     tgtesttools.extend([
+         "pysqlite"
+         ])
+     standard = ["SQLObject==bugfix,>=0.7.1dev-r1860,<=0.7.99"]
+-else:
+-    install_requires.extend([
+-        "Cheetah >= 2.0rc7",
+-        ])
+-
+ 
+ setup(
+     name="TurboGears",


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TurboGears.spec	5 May 2007 07:52:55 -0000	1.17
+++ TurboGears.spec	11 May 2007 07:23:36 -0000	1.18
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -58,8 +58,8 @@
 
 %prep
 %setup -q
-%patch0
-%patch1
+%patch0 -b .setuptools
+%patch1 -b .etree
 
 
 %build
@@ -82,6 +82,10 @@
 %{python_sitelib}/turbogears/
 
 %changelog
+* Thu May 11 2007 Luke Macken <lmacken at redhat.com> 1.0.2.2-2
+- Update etree patch to work with Python2.4
+- Update setuptools patch
+
 * Thu May 3 2007 Luke Macken <lmacken at redhat.com> 1.0.2.2-1
 - 1.0.2.2
 - TurboGears-1.0.2.2-etree.patch to use xml.etree instead of elementtree module




More information about the fedora-extras-commits mailing list