diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..02957c9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/CherryPy-3.2.2.tar.gz diff --git a/.python-cherrypy.metadata b/.python-cherrypy.metadata new file mode 100644 index 0000000..fb98218 --- /dev/null +++ b/.python-cherrypy.metadata @@ -0,0 +1 @@ +ad47d2d9c2c68231f0ea1b09ffb2927f42a493b6 SOURCES/CherryPy-3.2.2.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/cherrypy-unittest.patch b/SOURCES/cherrypy-unittest.patch new file mode 100644 index 0000000..0cb9774 --- /dev/null +++ b/SOURCES/cherrypy-unittest.patch @@ -0,0 +1,11 @@ +--- CherryPy-3.2.2/cherrypy/test/helper.py.orig 2011-10-27 22:34:31.218368540 -0700 ++++ CherryPy-3.2.2/cherrypy/test/helper.py 2011-10-27 22:34:53.093040680 -0700 +@@ -299,7 +299,7 @@ + def test_gc(self): + if self.do_gc_test: + self.getPage("/gc/stats") +- self.assertBody("Statistics:") ++ self.assertMatchesBody("^Statistics:") + # Tell nose to run this last in each class. + # Prefer sys.maxint for Python 2.3, which didn't have float('inf') + test_gc.compat_co_firstlineno = getattr(sys, 'maxint', None) or float('inf') diff --git a/SOURCES/python-cherrypy-tutorial-doc.patch b/SOURCES/python-cherrypy-tutorial-doc.patch new file mode 100644 index 0000000..cc37c2e --- /dev/null +++ b/SOURCES/python-cherrypy-tutorial-doc.patch @@ -0,0 +1,32 @@ +Index: CherryPy-3.2.1/setup.py +=================================================================== +--- CherryPy-3.2.1.orig/setup.py ++++ CherryPy-3.2.1/setup.py +@@ -59,7 +59,6 @@ url="http://www.cherrypy.org" + cp_license="BSD" + packages=[ + "cherrypy", "cherrypy.lib", +- "cherrypy.tutorial", "cherrypy.test", + "cherrypy.process", + "cherrypy.scaffold", + "cherrypy.wsgiserver", +@@ -76,19 +75,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', +- 'cherrypy/tutorial/README.txt', +- 'cherrypy/tutorial/pdf_file.pdf', +- 'cherrypy/tutorial/custom_error.html', +- ] +- ), + ] + scripts = ["cherrypy/cherryd"] + diff --git a/SPECS/python-cherrypy.spec b/SPECS/python-cherrypy.spec new file mode 100644 index 0000000..4a85ce4 --- /dev/null +++ b/SPECS/python-cherrypy.spec @@ -0,0 +1,175 @@ +%if !(0%{?fedora} > 12 || 0%{?rhel} > 5) +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%endif + +Name: python-cherrypy +Version: 3.2.2 +Release: 4%{?dist} +Summary: 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 +# Don't ship the tests or tutorials in the python module directroy, +# tutorial will be shipped as doc instead +Patch0: python-cherrypy-tutorial-doc.patch +Patch1: cherrypy-unittest.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch + +BuildRequires: python2-devel +BuildRequires: python-setuptools +BuildRequires: python-nose + +%description +CherryPy allows developers to build web applications in much the same way +they would build any other object-oriented Python program. This usually +results in smaller source code developed in less time. + +%prep +%setup -q -n CherryPy-%{version} +%patch0 -p1 +%patch1 -p1 + +%{__sed} -i 's/\r//' README.txt cherrypy/tutorial/README.txt cherrypy/tutorial/tutorial.conf + +%build +%{__python} setup.py build + +%install +rm -rf $RPM_BUILD_ROOT +%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT + +%check +cd cherrypy/test +# These two tests hang in the buildsystem so we have to disable them. +# The third fails in cherrypy 3.2.2. +PYTHONPATH='../../' nosetests -s ./ -e 'test_SIGTERM' -e \ + 'test_SIGHUP_tty' -e 'test_file_stream' + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc README.txt +%doc cherrypy/tutorial +%{_bindir}/cherryd +%{python_sitelib}/* + +%changelog +* Tue Jun 9 2015 Rob Crittenden - 3.2.2-4 +- Rebuild for EL 7.2 + +* Sat Jul 21 2012 Fedora Release Engineering - 3.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 3.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Oct 27 2011 Conrad Meyer - 3.2.2-1 +- Update to 3.2.2 + +* Sat Jul 16 2011 Toshio Kuratomi - 3.2.1-1 +- Update to 3.2.1 + +* Tue Feb 08 2011 Fedora Release Engineering - 3.1.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jul 21 2010 David Malcolm - 3.1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Mon May 31 2010 Toshio Kuratomi - 3.1.2-4 +- Fix a failing unittest with newer python + +* Sat Apr 24 2010 Toshio Kuratomi - 3.1.2-3 +- Revert a try at 3.2.x-rc1 as the tests won't pass without some work. + +* Sun Jul 26 2009 Fedora Release Engineering - 3.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Jun 16 2009 Toshio Kuratomi - 3.1.2-1 +- New upstream with python-2.6 fixes. +- BR tidy for tests. + +* Thu Feb 26 2009 Fedora Release Engineering - 3.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Dec 1 2008 Toshio Kuratomi - 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 - 3.0.3-3 +- Rebuild for Python 2.6 + +* Tue Jan 22 2008 Toshio Kuratomi 3.0.3-2 +- Forgot to upload the tarball. + +* Mon Jan 21 2008 Toshio Kuratomi 3.0.3-1 +- Upgrade to 3.0.3. + +* Thu Jan 17 2008 Toshio Kuratomi 2.3.0-2 +- EINTR Patch needed to be forwarded ported as well as it is only applied to + CP trunk (3.x). + +* Thu Jan 17 2008 Toshio Kuratomi 2.3.0-1 +- Update to new upstream which rolls in the backported security fix. +- Refresh other patches to apply against new version. +- Change to new canonical source URL. +- Reenable tests. + +* Sun Jan 6 2008 Toshio Kuratomi 2.2.1-8 +- Fix a security bug with a backport of http://www.cherrypy.org/changeset/1775 +- Include the egginfo files as well as the python files. + +* Sat Nov 3 2007 Luke Macken 2.2.1-7 +- Apply backported fix from http://www.cherrypy.org/changeset/1766 + to improve CherryPy's SIGSTOP/SIGCONT handling (Bug #364911). + Thanks to Nils Philippsen for the patch. + +* Mon Feb 19 2007 Luke Macken 2.2.1-6 +- Disable regression tests until we can figure out why they + are dying in mock. + +* Sun Dec 10 2006 Luke Macken 2.2.1-5 +- Add python-devel to BuildRequires + +* Sun Dec 10 2006 Luke Macken 2.2.1-4 +- Rebuild for python 2.5 + +* Mon Sep 18 2006 Luke Macken 2.2.1-3 +- Rebuild for FC6 +- Include pyo files instead of ghosting them + +* Thu Jul 13 2006 Luke Macken 2.2.1-2 +- Rebuild + +* Thu Jul 13 2006 Luke Macken 2.2.1-1 +- Update to 2.2.1 +- Remove unnecessary python-abi requirement + +* Sat Apr 22 2006 Gijs Hollestelle 2.2.0-1 +- Update to 2.2.0 + +* Wed Feb 22 2006 Gijs Hollestelle 2.1.1-1 +- Update to 2.1.1 (Security fix) + +* Tue Nov 1 2005 Gijs Hollestelle 2.1.0-1 +- Updated to 2.1.0 + +* Sat May 14 2005 Gijs Hollestelle 2.0.0-2 +- Added dist tag + +* Sun May 8 2005 Gijs Hollestelle 2.0.0-1 +- Updated to 2.0.0 final +- Updated python-cherrypy-tutorial-doc.patch to match new version + +* Wed Apr 6 2005 Ignacio Vazquez-Abrams 2.0.0-0.2.b +- Removed CFLAGS + +* Wed Mar 23 2005 Gijs Hollestelle 2.0.0-0.1.b +- Initial Fedora Package