rpms/TurboGears/F-7 TurboGears-1.0.3.2-setuptools.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 TurboGears.spec, 1.18, 1.19 sources, 1.7, 1.8 TurboGears-1.0.2.2-etree.patch, 1.2, NONE TurboGears-1.0.2.2-setuptools.patch, 1.2, NONE
Luke Macken (lmacken)
fedora-extras-commits at redhat.com
Sun Oct 7 00:48:01 UTC 2007
- Previous message (by thread): rpms/python-simplejson/F-7 .cvsignore, 1.6, 1.7 python-simplejson.spec, 1.11, 1.12 sources, 1.6, 1.7
- Next message (by thread): rpms/python-turbojson/F-7 .cvsignore, 1.2, 1.3 python-turbojson.spec, 1.2, 1.3 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: lmacken
Update of /cvs/pkgs/rpms/TurboGears/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8608
Modified Files:
.cvsignore TurboGears.spec sources
Added Files:
TurboGears-1.0.3.2-setuptools.patch
Removed Files:
TurboGears-1.0.2.2-etree.patch
TurboGears-1.0.2.2-setuptools.patch
Log Message:
1.0.3.2
TurboGears-1.0.3.2-setuptools.patch:
--- NEW FILE TurboGears-1.0.3.2-setuptools.patch ---
Index: setup.py
===================================================================
--- setup.py.orig
+++ setup.py
@@ -16,34 +16,23 @@ install_requires = [
"TurboJson >= 0.9.9",
"TurboCheetah >= 0.9.5",
"TurboKid >= 1.0.2",
- "CherryPy >= 2.2.1,<3.0.0alpha",
"simplejson >= 1.3",
- "elementtree >= 1.2.6",
"PasteScript >= 0.9.7",
- "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"]
+tgtesttools = ["nose >= 0.9.1", "SQLAlchemy>=0.3,<0.4alpha"]
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",
@@ -127,7 +116,7 @@ The latest development version is availa
extras_require = {
"exp" : ["TGFastData"],
"standard" : standard,
- "future" : ["Genshi>=0.3", "SQLAlchemy>=0.3"],
+ "future" : ["Genshi>=0.3", "SQLAlchemy>=0.3,<0.4alpha"],
"testtools" : ["nose >= 0.9.1"],
"tgtesttools" : tgtesttools,
},
Index: turbogears/qstemplates/quickstart/start-+package+.py_tmpl
===================================================================
--- turbogears/qstemplates/quickstart/start-+package+.py_tmpl.orig
+++ turbogears/qstemplates/quickstart/start-+package+.py_tmpl
@@ -1,6 +1,6 @@
#!${sys_executable}
+__requires__="TurboGears"
import pkg_resources
-pkg_resources.require("TurboGears")
from turbogears import config, update_config, start_server
import cherrypy
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 5 May 2007 07:52:55 -0000 1.7
+++ .cvsignore 7 Oct 2007 00:47:27 -0000 1.8
@@ -1 +1 @@
-TurboGears-1.0.2.2.tar.gz
+TurboGears-1.0.3.2.tar.gz
Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-7/TurboGears.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- TurboGears.spec 11 May 2007 07:23:36 -0000 1.18
+++ TurboGears.spec 7 Oct 2007 00:47:27 -0000 1.19
@@ -2,8 +2,8 @@
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
Name: TurboGears
-Version: 1.0.2.2
-Release: 2%{?dist}
+Version: 1.0.3.2
+Release: 4%{?dist}
Summary: Back-to-front web development in Python
Group: Development/Languages
@@ -11,11 +11,15 @@
URL: http://www.turbogears.org
Source0: http://files.turbogears.org/eggs/%{name}-%{version}.tar.gz
Patch0: %{name}-%{version}-setuptools.patch
-Patch1: %{name}-%{version}-etree.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: python-setuptools >= 0.6c2 python-devel
+BuildRequires: python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
# ElementTree is part of python 2.5 on FC7+
%if 0%{?fedora} <= 6
@@ -23,8 +27,16 @@
Requires: python-elementtree >= 1.2.6
%endif
-Requires: python-kid >= 0.8
+# The main packages have gone up a version. Need to require the older versions
+%if 0%{?fedora} >= 8
+Requires: python-sqlalchemy0.3
+%else
+Requires: python-sqlalchemy >= 0.3
+%endif
+
Requires: python-cherrypy >= 2.2.1
+
+Requires: python-kid >= 0.8
Requires: python-sqlobject >= 0.8
Requires: python-formencode >= 0.7.1
Requires: python-json >= 3.3
@@ -59,12 +71,10 @@
%prep
%setup -q
%patch0 -b .setuptools
-%patch1 -b .etree
%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
-%{__python} setup.py build
%install
rm -rf %{buildroot}
@@ -82,6 +92,22 @@
%{python_sitelib}/turbogears/
%changelog
+* Fri Oct 5 2007 Toshio Kuratomi <a.badger at gmail.com> 1.0.3.2-4
+- Require sqlalchemy 0.3.
+
+* Thu Sep 27 2007 Toshio Kuratomi <a.badger at gmail.com> 1.0.3.2-3
+- Update setuptools patch to modify quickstart template for compat eggs as well.
+
+* Mon Sep 24 2007 Luke Macken <lmacken at redhat.com> 1.0.3.2-2
+- Update setuptools patch to "fix" CherryPy dependency error
+
+* Mon Sep 13 2007 Luke Macken <lmacken at redhat.com> 1.0.3.2-1
+- 1.0.3.2
+- Remove etree patch
+
+* Sun Sep 2 2007 Luke Macken <lmacken at redhat.com> 1.0.2.2-3
+- Update for python-setuptools changes in rawhide
+
* 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 5 May 2007 07:52:55 -0000 1.7
+++ sources 7 Oct 2007 00:47:27 -0000 1.8
@@ -1 +1 @@
-a8d79645b4ce67409026838ca360addc TurboGears-1.0.2.2.tar.gz
+75471c1767af970479ca2d4788a30323 TurboGears-1.0.3.2.tar.gz
--- TurboGears-1.0.2.2-etree.patch DELETED ---
--- TurboGears-1.0.2.2-setuptools.patch DELETED ---
- Previous message (by thread): rpms/python-simplejson/F-7 .cvsignore, 1.6, 1.7 python-simplejson.spec, 1.11, 1.12 sources, 1.6, 1.7
- Next message (by thread): rpms/python-turbojson/F-7 .cvsignore, 1.2, 1.3 python-turbojson.spec, 1.2, 1.3 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list