rpms/python-cherrypy/devel .cvsignore, 1.9, 1.10 python-cherrypy-tutorial-doc.patch, 1.8, 1.9 python-cherrypy.spec, 1.20, 1.21 sources, 1.9, 1.10 python-cherrypy-regression-test.patch, 1.6, NONE
Toshio くらとみ
toshio at fedoraproject.org
Mon Dec 1 17:59:57 UTC 2008
Author: toshio
Update of /cvs/pkgs/rpms/python-cherrypy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7589
Modified Files:
.cvsignore python-cherrypy-tutorial-doc.patch
python-cherrypy.spec sources
Removed Files:
python-cherrypy-regression-test.patch
Log Message:
* Mon Dec 1 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 3.1.1-1
- Update to 3.1.1
- Fix python-2.6 build errors
- Make test code non-interactive via cmdline switch
- Refresh the no test and tutorial patch
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-cherrypy/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 22 Jan 2008 16:15:49 -0000 1.9
+++ .cvsignore 1 Dec 2008 17:59:27 -0000 1.10
@@ -1 +1 @@
-CherryPy-3.0.3.tar.gz
+CherryPy-3.1.1.tar.gz
python-cherrypy-tutorial-doc.patch:
Index: python-cherrypy-tutorial-doc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-cherrypy/devel/python-cherrypy-tutorial-doc.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-cherrypy-tutorial-doc.patch 21 Jan 2008 21:23:26 -0000 1.8
+++ python-cherrypy-tutorial-doc.patch 1 Dec 2008 17:59:27 -0000 1.9
@@ -1,16 +1,23 @@
-Index: CherryPy-3.0.3/setup.py
-===================================================================
---- CherryPy-3.0.3.orig/setup.py
-+++ CherryPy-3.0.3/setup.py
-@@ -38,23 +38,11 @@ url="http://www.cherrypy.org"
+diff -up CherryPy-3.1.1/setup.py.orig CherryPy-3.1.1/setup.py
+--- CherryPy-3.1.1/setup.py.orig 2008-12-01 09:50:36.000000000 -0800
++++ CherryPy-3.1.1/setup.py 2008-12-01 09:51:38.000000000 -0800
+@@ -38,7 +38,6 @@ url="http://www.cherrypy.org"
cp_license="BSD"
packages=[
"cherrypy", "cherrypy.lib",
-- "cherrypy.tutorial", "cherrypy.test",
- "cherrypy.wsgiserver",
+- "cherrypy.tutorial", "cherrypy.test",
+ "cherrypy.wsgiserver", "cherrypy.process",
+ "cherrypy.scaffold",
]
- download_url="http://download.cherrypy.org/cherrypy/3.0.3/"
- data_files=[
+@@ -54,19 +53,6 @@ data_files=[
+ ]),
+ ('cherrypy/scaffold/static', ['cherrypy/scaffold/static/made_with_cherrypy_small.png',
+ ]),
+- ('cherrypy/test', ['cherrypy/test/style.css',
+- 'cherrypy/test/test.pem',
+- ]),
+- ('cherrypy/test/static', ['cherrypy/test/static/index.html',
+- 'cherrypy/test/static/dirback.jpg',]),
- ('cherrypy/tutorial',
- [
- 'cherrypy/tutorial/tutorial.conf',
@@ -19,10 +26,6 @@
- 'cherrypy/tutorial/custom_error.html',
- ]
- ),
- ('cherrypy', ['cherrypy/favicon.ico',]),
-- ('cherrypy/test', ['cherrypy/test/style.css',]),
-- ('cherrypy/test/static', ['cherrypy/test/static/index.html',
-- 'cherrypy/test/static/dirback.jpg',]),
]
###############################################################################
# end arguments for setup
Index: python-cherrypy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-cherrypy/devel/python-cherrypy.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- python-cherrypy.spec 29 Nov 2008 15:27:17 -0000 1.20
+++ python-cherrypy.spec 1 Dec 2008 17:59:27 -0000 1.21
@@ -1,26 +1,21 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: python-cherrypy
-Version: 3.0.3
-Release: 3%{?dist}
+Version: 3.1.1
+Release: 1%{?dist}
Summary: A pythonic, object-oriented web development framework
Group: Development/Libraries
License: BSD
URL: http://www.cherrypy.org/
Source0: http://download.cherrypy.org/cherrypy/%{version}/CherryPy-%{version}.tar.gz
Patch0: python-cherrypy-tutorial-doc.patch
-Patch1: python-cherrypy-regression-test.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python-devel
-%if 0%{?fedora} >= 8
BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
%description
CherryPy allows developers to build web applications in much the same way
@@ -30,7 +25,6 @@
%prep
%setup -q -n CherryPy-%{version}
%patch0 -p1
-%patch1 -p1
%{__sed} -i 's/\r//' README.txt cherrypy/tutorial/README.txt cherrypy/tutorial/tutorial.conf
@@ -43,7 +37,7 @@
%check
cd cherrypy/test
-%{__python} test.py
+%{__python} test.py --dumb
%clean
rm -rf $RPM_BUILD_ROOT
@@ -55,6 +49,12 @@
%{python_sitelib}/*
%changelog
+* Mon Dec 1 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 3.1.1-1
+- Update to 3.1.1
+- Fix python-2.6 build errors
+- Make test code non-interactive via cmdline switch
+- Refresh the no test and tutorial patch
+
* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 3.0.3-3
- Rebuild for Python 2.6
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-cherrypy/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 22 Jan 2008 16:15:49 -0000 1.9
+++ sources 1 Dec 2008 17:59:27 -0000 1.10
@@ -1 +1 @@
-a9c5efd94ff1b87f0f1cc29d09875670 CherryPy-3.0.3.tar.gz
+1803ebb8f930cea862ad4c9b2a910f0d CherryPy-3.1.1.tar.gz
--- python-cherrypy-regression-test.patch DELETED ---
More information about the fedora-extras-commits
mailing list