From af99178358812a0de620d169fbcb40d37256246525ff68fcc3d0066f2bc20166 Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 22 Nov 2012 12:54:51 +0000 Subject: [PATCH] Accepting request 142387 from devel:languages:python3 Remove openSUSE 11.4 spec file workarounds (forwarded request 142386 from TheBlackCat) OBS-URL: https://build.opensuse.org/request/show/142387 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-CherryPy?expand=0&rev=7 --- python3-CherryPy.changes | 5 +++++ python3-CherryPy.spec | 12 +----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/python3-CherryPy.changes b/python3-CherryPy.changes index 7b1c35c..82f634e 100644 --- a/python3-CherryPy.changes +++ b/python3-CherryPy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 22 09:39:27 UTC 2012 - toddrme2178@gmail.com + +- Remove openSUSE 11.4 spec file workarounds + ------------------------------------------------------------------- Fri May 25 08:33:12 UTC 2012 - toddrme2178@gmail.com diff --git a/python3-CherryPy.spec b/python3-CherryPy.spec index d40ce73..7ec8a63 100644 --- a/python3-CherryPy.spec +++ b/python3-CherryPy.spec @@ -26,14 +26,8 @@ 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)} -%else -BuildRequires: python3-base -%endif Requires: python(abi) = %{py3_ver} -BuildArch: noarch +BuildArch: noarch %description CherryPy is a pythonic, object-oriented HTTP framework. @@ -69,9 +63,5 @@ 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