From 453f18daef20d4df768b47469153928edf1b8d17858a0988c0abf8021257c111 Mon Sep 17 00:00:00 2001 From: Todd R Date: Fri, 25 May 2012 09:26:57 +0000 Subject: [PATCH] Accepting request 122294 from devel:languages:python3 - Fix building on openSUSE 11.4 - spec file cleanups (forwarded request 122292 from TheBlackCat) OBS-URL: https://build.opensuse.org/request/show/122294 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-SQLAlchemy?expand=0&rev=26 --- python3-SQLAlchemy.changes | 6 ++++++ python3-SQLAlchemy.spec | 17 +++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/python3-SQLAlchemy.changes b/python3-SQLAlchemy.changes index 8d34ee5..de6507b 100644 --- a/python3-SQLAlchemy.changes +++ b/python3-SQLAlchemy.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 06:45:21 UTC 2012 - highwaystar.ru@gmail.com diff --git a/python3-SQLAlchemy.spec b/python3-SQLAlchemy.spec index a06b9ff..558cd0a 100644 --- a/python3-SQLAlchemy.spec +++ b/python3-SQLAlchemy.spec @@ -29,19 +29,15 @@ BuildRequires: python3-devel BuildRequires: python3-distribute BuildRequires: python3-nose BuildRequires: python3-2to3 - -%if 0%{?suse_version} && 0%{?suse_version} <= 1140 +%if 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 +Requires: python(abi) = %{py3_ver} #cextension not working yet with py3, so build as noarch -%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1} -BuildArchitectures: noarch -%endif +BuildArch: noarch %description SQLAlchemy is an Object Relational Mappper (ORM) that provides a flexible, @@ -77,16 +73,17 @@ CFLAGS="%{optflags} -fno-strict-aliasing" python3 setup.py build %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} -%if 0%{?suse_version} > 1110 %check python3 ./sqla_nose.py -%endif %files %defattr(-,root,root,-) %doc CHANGES CHANGES_PRE_06 LICENSE README.rst README.py3k README.unittests %{python3_sitelib}/sqlalchemy/ %{python3_sitelib}/SQLAlchemy-%{version}-py%{py3_ver}.egg-info +%if 0%{?suse_version} <= 1140 +%dir %{_prefix}/lib/python%{py3_ver} +%endif %files doc %defattr(-,root,root)