rpms/TurboGears/EL-5 TurboGears-1.0.3.2-setuptools.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 TurboGears.spec, 1.16, 1.17 sources, 1.6, 1.7 TurboGears-setuptools.patch, 1.4, NONE
Luke Macken (lmacken)
fedora-extras-commits at redhat.com
Tue Nov 27 21:19:38 UTC 2007
- Previous message (by thread): rpms/gfs-olga-fonts/F-8 gfs-olga-fonts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/gfs-olga-fonts/F-7 gfs-olga-fonts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: lmacken
Update of /cvs/pkgs/rpms/TurboGears/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24073
Modified Files:
.cvsignore TurboGears.spec sources
Added Files:
TurboGears-1.0.3.2-setuptools.patch
Removed Files:
TurboGears-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,10 @@
#!${sys_executable}
+#if $sqlalchemy != "True"
+__requires__="TurboGears"
+#else
+__requires__="TurboGears[future]"
+#end if
import pkg_resources
-pkg_resources.require("TurboGears")
from turbogears import config, update_config, start_server
import cherrypy
@@ -22,5 +26,4 @@ else:
config.update(dict(package="${package}"))
from ${package}.controllers import Root
-
start_server(Root())
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 24 Jan 2007 17:57:48 -0000 1.6
+++ .cvsignore 27 Nov 2007 21:19:04 -0000 1.7
@@ -1 +1 @@
-TurboGears-1.0.1.tar.gz
+TurboGears-1.0.3.2.tar.gz
Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/TurboGears.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TurboGears.spec 26 Jan 2007 08:48:49 -0000 1.16
+++ TurboGears.spec 27 Nov 2007 21:19:04 -0000 1.17
@@ -2,19 +2,19 @@
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
Name: TurboGears
-Version: 1.0.1
-Release: 2%{?dist}
+Version: 1.0.3.2
+Release: 1%{?dist}
Summary: Back-to-front web development in Python
Group: Development/Languages
License: MIT
URL: http://www.turbogears.org
Source0: http://files.turbogears.org/eggs/%{name}-%{version}.tar.gz
-Patch0: %{name}-setuptools.patch
+Patch0: %{name}-%{version}-setuptools.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: python-setuptools >= 0.6c2 python-devel
+BuildRequires: python-devel python-setuptools-devel
# ElementTree is part of python 2.5 on FC7+
%if 0%{?fedora} <= 6
@@ -22,15 +22,31 @@
Requires: python-elementtree >= 1.2.6
%endif
-Requires: python-kid >= 0.8 python-cherrypy >= 2.2.1
-Requires: python-sqlobject >= 0.7 python-formencode >= 0.5.1
+# 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
-Requires: python-setuptools >= 0.6a11
-Requires: python-turbocheetah >= 0.9.5 python-turbojson >= 0.9.9
-Requires: python-turbokid >= 0.9.8 python-tgfastdata
-Requires: python-simplejson >= 1.3 python-paste-script >= 0.9.7
-Requires: python-configobj >= 4.3.2 python-ruledispatch
-Requires: python-nose >= 0.9 python-psycopg2 python-TestGears
+Requires: python-setuptools >= 0.6c2
+Requires: python-turbocheetah >= 0.9.5
+Requires: python-turbojson >= 0.9.9
+Requires: python-turbokid >= 1.0.1
+Requires: python-tgfastdata
+Requires: python-simplejson >= 1.3
+Requires: python-paste-script >= 0.9.7
+Requires: python-configobj >= 4.3.2
+Requires: python-ruledispatch
+Requires: python-nose >= 0.9.1
+Requires: python-psycopg2
+Requires: python-decoratortools >= 1.4
%description
TurboGears brings together four major pieces to create an
@@ -48,12 +64,11 @@
%prep
%setup -q
-%patch0 -p1
+%patch0 -b .setuptools
%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
-%{__python} setup.py build
%install
rm -rf %{buildroot}
@@ -71,6 +86,9 @@
%{python_sitelib}/turbogears/
%changelog
+* Tue Nov 27 2007 Luke Macken <lmacken at redhat.com> 1.0.3.2-1
+- 1.0.3.2
+
* Fri Jan 26 2007 Toshio Kuratomi <toshio at tiki-lounge.com> 1.0.1-2
- Don't flub the patch this time.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 24 Jan 2007 17:57:48 -0000 1.6
+++ sources 27 Nov 2007 21:19:04 -0000 1.7
@@ -1 +1 @@
-57580dce73ab2fc5c7f72e3e3cd804b1 TurboGears-1.0.1.tar.gz
+75471c1767af970479ca2d4788a30323 TurboGears-1.0.3.2.tar.gz
--- TurboGears-setuptools.patch DELETED ---
- Previous message (by thread): rpms/gfs-olga-fonts/F-8 gfs-olga-fonts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/gfs-olga-fonts/F-7 gfs-olga-fonts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list