From 7c28fbd366582146a0102119ce91b03f4e39da6f9018533bf6c1b82de0b048f0 Mon Sep 17 00:00:00 2001 From: Pascal Bleser Date: Mon, 12 Dec 2011 08:57:05 +0000 Subject: [PATCH 1/3] remove %debug_package OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-CherryPy?expand=0&rev=3 From 4277beee4e092244fdbbbc6c97fdbc0bbb2a59d2c3de51e58bf38adb35a05d0d Mon Sep 17 00:00:00 2001 From: Todd R Date: Wed, 23 May 2012 07:12:51 +0000 Subject: [PATCH 2/3] Accepting request 121837 from home:HighwayStar:branches:devel:languages:python update to 3.2.2, python3 package added OBS-URL: https://build.opensuse.org/request/show/121837 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-CherryPy?expand=0&rev=4 --- CherryPy-3.2.0.tar.bz2 | 3 -- CherryPy-3.2.2.tar.bz2 | 3 ++ python-CherryPy.changes | 7 ++++ python-CherryPy.spec | 7 ++-- python3-CherryPy.changes | 5 +++ python3-CherryPy.spec | 78 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 97 insertions(+), 6 deletions(-) delete mode 100644 CherryPy-3.2.0.tar.bz2 create mode 100644 CherryPy-3.2.2.tar.bz2 create mode 100644 python3-CherryPy.changes create mode 100644 python3-CherryPy.spec diff --git a/CherryPy-3.2.0.tar.bz2 b/CherryPy-3.2.0.tar.bz2 deleted file mode 100644 index 163db1d..0000000 --- a/CherryPy-3.2.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cdd2b31288b5969e9c8e1578f9481de1dad5d19ae21af239bdd0d2c6db61a3c2 -size 790876 diff --git a/CherryPy-3.2.2.tar.bz2 b/CherryPy-3.2.2.tar.bz2 new file mode 100644 index 0000000..9515c46 --- /dev/null +++ b/CherryPy-3.2.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65d76308bc2e70338ec0e503ffadd4b5a781c8e75ac2212fa3bb70457462fc6b +size 344218 diff --git a/python-CherryPy.changes b/python-CherryPy.changes index 85f3053..a671536 100644 --- a/python-CherryPy.changes +++ b/python-CherryPy.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 23 04:54:27 UTC 2012 - highwaystar.ru@gmail.com + +- update to 3.2.2 +- python3 package added +- minor spec improvement + ------------------------------------------------------------------- Tue May 31 07:21:03 UTC 2011 - saschpe@suse.de diff --git a/python-CherryPy.spec b/python-CherryPy.spec index 6f6c56a..95c3c3d 100644 --- a/python-CherryPy.spec +++ b/python-CherryPy.spec @@ -1,7 +1,7 @@ # # spec file for package python-CherryPy # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: python-CherryPy -Version: 3.2.0 +Version: 3.2.2 Release: 1 Url: http://www.cherrypy.org Summary: Object-Oriented HTTP framework @@ -71,6 +71,7 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc README.txt %{_bindir}/cherryd -%python_sitelib/* +%{python_sitelib}/cherrypy/ +%{python_sitelib}/CherryPy-%{version}-py%{py_ver}.egg-info %changelog diff --git a/python3-CherryPy.changes b/python3-CherryPy.changes new file mode 100644 index 0000000..cf2f95d --- /dev/null +++ b/python3-CherryPy.changes @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Wed May 23 04:57:34 UTC 2012 - highwaystar.ru@gmail.com + +- python3 package added + diff --git a/python3-CherryPy.spec b/python3-CherryPy.spec new file mode 100644 index 0000000..35fffeb --- /dev/null +++ b/python3-CherryPy.spec @@ -0,0 +1,78 @@ +# +# spec file for package python3-CherryPy +# +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +Name: python3-CherryPy +Version: 3.2.2 +Release: 1 +Url: http://www.cherrypy.org +Summary: Object-Oriented HTTP framework +License: BSD-3-Clause +Group: Development/Languages/Python +Source: CherryPy-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: python3-devel + +%if 0%{?suse_version} && 0%{?suse_version} <= 1140 +%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?py3_ver: %global py3_ver %(python3 -c "import sys; version=str(sys.version_info[0]) + '.' + str(sys.version_info[1]); print(version)" 2>/dev/null || echo PYTHON-NOT-FOUND)} +%endif +Requires: python(abi) = %{py3_ver} +%if 0%{?suse_version} && 0%{?suse_version} > 1140 +BuildRequires: python3-base +%endif + +%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1} +BuildArchitectures: noarch +%endif + +%description +CherryPy is a pythonic, object-oriented HTTP framework. + +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. + +CherryPy is now more than three years old and it is has proven very fast and +stable. It is being used in production by many sites, from the simplest ones +to the most demanding ones. + +Oh, and most importantly: CherryPy is fun to work with :-) + +%prep +%setup -q -n CherryPy-%{version} + +%build +export CFLAGS="%{optflags}" +python3 setup.py build + +%install +sed -i 's|\r||' README.txt # Fix wrong EOL encoding +find . -name sessiondemo.py -type f -exec chmod 0755 {} \; # Fix non-executable bit rpmlint warning +python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} +mv %{buildroot}%{_bindir}/cherryd %{buildroot}%{_bindir}/cherryd-python%{py3_ver} +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%doc README.txt +%{_bindir}/cherryd-python%{py3_ver} +%{python3_sitelib}/cherrypy/ +%{python3_sitelib}/CherryPy-%{version}-py%{py3_ver}.egg-info + +%changelog From 392379eee49e7bb6ea6681f1c2d2c06a638daeb8b84a64f8f8e90922cffada7a Mon Sep 17 00:00:00 2001 From: Todd R Date: Fri, 25 May 2012 09:28:42 +0000 Subject: [PATCH 3/3] Accepting request 122299 from devel:languages:python3 - Fix building on openSUSE 11.4 - spec file cleanups (forwarded request 122297 from TheBlackCat) OBS-URL: https://build.opensuse.org/request/show/122299 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-CherryPy?expand=0&rev=5 --- python3-CherryPy.changes | 6 ++++++ python3-CherryPy.spec | 15 +++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/python3-CherryPy.changes b/python3-CherryPy.changes index cf2f95d..7b1c35c 100644 --- a/python3-CherryPy.changes +++ b/python3-CherryPy.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 25 08:33:12 UTC 2012 - toddrme2178@gmail.com + +- Fix building on openSUSE 11.4 +- spec file cleanups + ------------------------------------------------------------------- Wed May 23 04:57:34 UTC 2012 - highwaystar.ru@gmail.com diff --git a/python3-CherryPy.spec b/python3-CherryPy.spec index 35fffeb..d40ce73 100644 --- a/python3-CherryPy.spec +++ b/python3-CherryPy.spec @@ -26,19 +26,14 @@ Group: Development/Languages/Python Source: CherryPy-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python3-devel - %if 0%{?suse_version} && 0%{?suse_version} <= 1140 %{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %{!?py3_ver: %global py3_ver %(python3 -c "import sys; version=str(sys.version_info[0]) + '.' + str(sys.version_info[1]); print(version)" 2>/dev/null || echo PYTHON-NOT-FOUND)} -%endif -Requires: python(abi) = %{py3_ver} -%if 0%{?suse_version} && 0%{?suse_version} > 1140 +%else BuildRequires: python3-base %endif - -%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1} -BuildArchitectures: noarch -%endif +Requires: python(abi) = %{py3_ver} +BuildArch: noarch %description CherryPy is a pythonic, object-oriented HTTP framework. @@ -74,5 +69,9 @@ rm -rf %{buildroot} %{_bindir}/cherryd-python%{py3_ver} %{python3_sitelib}/cherrypy/ %{python3_sitelib}/CherryPy-%{version}-py%{py3_ver}.egg-info +%if 0%{?suse_version} <= 1140 +%dir %{_prefix}/lib/python%{py3_ver} +%dir %{python3_sitelib} +%endif %changelog