rpms/python-cherrypy2/devel python-cherrypy2.spec, 1.3, 1.4 python-cherrypy-regression-test.patch, 1.1, NONE

Toshio くらとみ toshio at fedoraproject.org
Mon Dec 1 18:23:14 UTC 2008


Author: toshio

Update of /cvs/pkgs/rpms/python-cherrypy2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9304

Modified Files:
	python-cherrypy2.spec 
Removed Files:
	python-cherrypy-regression-test.patch 
Log Message:

* Mon Dec 1 2008 Toshio Kuratomi <toshio at fedoraproject.org> 2.3.0-6
- Set tests to be non-interactive via the commandline instead of a patch.
  Should fix build errors with Python-2.6



Index: python-cherrypy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-cherrypy2/devel/python-cherrypy2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-cherrypy2.spec	29 Nov 2008 15:27:18 -0000	1.3
+++ python-cherrypy2.spec	1 Dec 2008 18:22:44 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           python-cherrypy2
 Version:        2.3.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A pythonic, object-oriented web development framework
 Group:          Development/Libraries
 License:        BSD
@@ -11,8 +11,7 @@
 Source1:        README.fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:         python-cherrypy-tutorial-doc.patch
-Patch1:         python-cherrypy-regression-test.patch
-Patch2:         python-cherrypy-2.3.0-EINTR.patch
+Patch1:         python-cherrypy-2.3.0-EINTR.patch
 
 BuildArch:      noarch
 
@@ -37,7 +36,6 @@
 %setup -q -n CherryPy-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %{__sed} -i 's/\r//' CHANGELOG.txt README.txt CHERRYPYTEAM.txt cherrypy/tutorial/README.txt
 cp -p %{SOURCE1} .
@@ -54,7 +52,7 @@
 
 %check
 cd cherrypy/test
-%{__python} test.py
+%{__python} test.py --dumb
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,6 +64,10 @@
 %{python_sitelib}/*
 
 %changelog
+* Mon Dec 1 2008 Toshio Kuratomi <toshio at fedoraproject.org> 2.3.0-6
+- Set tests to be non-interactive via the commandline instead of a patch.
+  Should fix build errors with Python-2.6
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.3.0-5
 - Rebuild for Python 2.6
 


--- python-cherrypy-regression-test.patch DELETED ---




More information about the fedora-extras-commits mailing list