rpms/TurboGears/devel .cvsignore, 1.5, 1.6 TurboGears-setuptools.patch, 1.1, 1.2 TurboGears.spec, 1.13, 1.14 sources, 1.5, 1.6
Toshio Ernie Kuratomi (toshio)
fedora-extras-commits at redhat.com
Wed Jan 24 17:58:18 UTC 2007
- Previous message: comps comps-fe5.xml.in, 1.237, 1.238 comps-fe6.xml.in, 1.278, 1.279 comps-fe7.xml.in, 1.85, 1.86
- Next message: rpms/geany/devel geany-dynamic-vte.patch, NONE, 1.1 geany.spec, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: toshio
Update of /cvs/extras/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2893
Modified Files:
.cvsignore TurboGears-setuptools.patch TurboGears.spec sources
Log Message:
- Upgrade to upstream 1.0.1.
- Update the setuptools patch.
- Conditionalize python-elementtree as python-2.5 provides it.
- Include rather than ghosting *.pyo.
- Require python-psycopg2 instead of psycopg, TurboGears + psycopg2 supports
unicode whereas psycopg does not and upstream recommends psycopg2.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/TurboGears/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 2 Dec 2006 05:25:12 -0000 1.5
+++ .cvsignore 24 Jan 2007 17:57:48 -0000 1.6
@@ -1 +1 @@
-TurboGears-1.0b2.tar.gz
+TurboGears-1.0.1.tar.gz
TurboGears-setuptools.patch:
Index: TurboGears-setuptools.patch
===================================================================
RCS file: /cvs/extras/rpms/TurboGears/devel/TurboGears-setuptools.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurboGears-setuptools.patch 2 Dec 2006 05:26:47 -0000 1.1
+++ TurboGears-setuptools.patch 24 Jan 2007 17:57:48 -0000 1.2
@@ -1,24 +1,23 @@
---- setup.py.orig 2006-12-02 00:14:03.000000000 -0500
-+++ setup.py 2006-12-02 00:16:52.000000000 -0500
-@@ -34,20 +34,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>.""",
+--- TurboGears-1.0.1/setup.py.bak 2007-01-24 01:54:52.000000000 -0800
++++ TurboGears-1.0.1/setup.py 2007-01-24 01:58:46.000000000 -0800
+@@ -35,18 +35,14 @@
url="http://www.turbogears.org",
zip_safe=False,
-- install_requires = [
+ install_requires = [
- "TurboJson >= 0.9.9",
-- "TurboCheetah >= 0.9.5",
-- "TurboKid >= 0.9.8",
++ "TurboJson >= 0.9.9",
+ "TurboCheetah >= 0.9.5",
+ "TurboKid >= 0.9.8",
- "CherryPy >= 2.2.1,<3.0.0alpha",
-- "simplejson >= 1.3",
+ "simplejson >= 1.3",
- "elementtree >= 1.2.6",
-- "PasteScript >= 0.9.7",
+ "PasteScript >= 0.9.7",
- "cElementTree >= 1.0.5",
-- "FormEncode >= 0.5.1",
-- "setuptools >= 0.6c2",
+ "FormEncode >= 0.5.1",
+ "setuptools >= 0.6c2",
- "RuleDispatch",
-- "ConfigObj >= 4.3.2",
-- "nose >= 0.9"],
-+ install_requires = [],
+- "ConfigObj >= 4.3.2"],
++ "RuleDispatch"],
packages=find_packages(),
include_package_data=True,
exclude_package_data={"thirdparty" : ["*"]},
Index: TurboGears.spec
===================================================================
RCS file: /cvs/extras/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TurboGears.spec 19 Jan 2007 07:10:07 -0000 1.13
+++ TurboGears.spec 24 Jan 2007 17:57:48 -0000 1.14
@@ -2,8 +2,8 @@
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
Name: TurboGears
-Version: 1.0b2
-Release: 6%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
Summary: Back-to-front web development in Python
Group: Development/Languages
@@ -15,17 +15,22 @@
BuildArch: noarch
BuildRequires: python-setuptools >= 0.6c2 python-devel
+
+# ElementTree is part of python 2.5 on FC7+
+%if 0%{?fedora} <= 6
BuildRequires: python-elementtree >= 1.2.6
+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
-Requires: python-json >= 3.3 python-elementtree >= 1.2.6
+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-psycopg python-TestGears
+Requires: python-nose >= 0.9 python-psycopg2 python-TestGears
%description
TurboGears brings together four major pieces to create an
@@ -43,7 +48,7 @@
%prep
%setup -q
-%patch0
+%patch0 -p1
%build
@@ -55,28 +60,26 @@
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
-# build the filelists
-for module in turbogears ; do
- echo '%defattr (0644,root,root,0755)' > $module-pyfiles
- find %{buildroot}%{python_sitelib}/$module -type d | \
- sed 's:%{buildroot}\(.*\):%dir \1:' >> $module-pyfiles
- find %{buildroot}%{python_sitelib}/$module -not -type d -not -name '*.pyo' \
- | sed 's:%{buildroot}\(.*\):\1:' >> $module-pyfiles
- find %{buildroot}%{python_sitelib}/$module -not -type d -name '*.pyo' | \
- sed 's:%{buildroot}\(.*\):%ghost \1:' >> $module-pyfiles
-done
-
%clean
rm -rf %{buildroot}
-%files -f turbogears-pyfiles
+%files
%defattr(-,root,root,-)
%doc CHANGELOG.txt LICENSE.txt
%{_bindir}/tg-admin
-%{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info
+%{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info/
+%{python_sitelib}/turbogears/
%changelog
+* Tue Jan 23 2007 Toshio Kuratomi <toshio at tiki-lounge.com> 1.0.1-1
+- Upgrade to upstream 1.0.1.
+- Update the setuptools patch.
+- Conditionalize python-elementtree as python-2.5 provides it.
+- Include rather than ghosting *.pyo.
+- Require python-psycopg2 instead of psycopg, TurboGears + psycopg2 supports
+ unicode whereas psycopg does not.
+
* Fri Jan 19 2007 Luke Macken <lmacken at redhat.com> 1.0b2-6
- Add python-elementtree to BuildRequires
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/TurboGears/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 2 Dec 2006 05:25:12 -0000 1.5
+++ sources 24 Jan 2007 17:57:48 -0000 1.6
@@ -1 +1 @@
-aff6ab4008557c21fde2ff8c07f4dc45 TurboGears-1.0b2.tar.gz
+57580dce73ab2fc5c7f72e3e3cd804b1 TurboGears-1.0.1.tar.gz
- Previous message: comps comps-fe5.xml.in, 1.237, 1.238 comps-fe6.xml.in, 1.278, 1.279 comps-fe7.xml.in, 1.85, 1.86
- Next message: rpms/geany/devel geany-dynamic-vte.patch, NONE, 1.1 geany.spec, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list