From 392379eee49e7bb6ea6681f1c2d2c06a638daeb8b84a64f8f8e90922cffada7a Mon Sep 17 00:00:00 2001 From: Todd R Date: Fri, 25 May 2012 09:28:42 +0000 Subject: [PATCH] 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