From ce2faa6a604d88c81c94aa4bbc7bfee7cbc2ac8f48c7d9b6460f20db0837bde9 Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 30 Apr 2012 11:52:42 +0000 Subject: [PATCH] Accepting request 116030 from devel:languages:python3 Fix building python 3 package on openSUSE 11.4 x86_64 (forwarded request 116029 from TheBlackCat) OBS-URL: https://build.opensuse.org/request/show/116030 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-docutils?expand=0&rev=9 --- python-docutils.changes | 5 +++++ python3-docutils.changes | 5 +++++ python3-docutils.spec | 12 ++++++++++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/python-docutils.changes b/python-docutils.changes index e801b43..92fa4df 100644 --- a/python-docutils.changes +++ b/python-docutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 27 14:07:19 UTC 2012 - toddrme2178@gmail.com + +- Fix building python 3 package on openSUSE 11.4 x86_64 + ------------------------------------------------------------------- Tue Apr 24 09:02:35 UTC 2012 - saschpe@suse.de diff --git a/python3-docutils.changes b/python3-docutils.changes index a49df8e..4af1a2a 100644 --- a/python3-docutils.changes +++ b/python3-docutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 27 14:07:19 UTC 2012 - toddrme2178@gmail.com + +- Fix building python 3 package on openSUSE 11.4 x86_64 + ------------------------------------------------------------------- Mon Apr 23 12:00:49 UTC 2012 - toddrme2178@gmail.com diff --git a/python3-docutils.spec b/python3-docutils.spec index 5aba5c6..d70264b 100644 --- a/python3-docutils.spec +++ b/python3-docutils.spec @@ -30,11 +30,16 @@ BuildRequires: python3-devel BuildRequires: python3-xml BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: python3-xml -Requires: python3 >= %{py3_ver} -BuildArch: noarch %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)} +%ifarch x86_64 +# to allow ownership of noarch python directories +BuildRequires: python3-32bit %endif +%endif +BuildArch: noarch +Requires: python3 >= %{py3_ver} %description Docutils is a modular system for processing documentation into useful formats, @@ -57,5 +62,8 @@ for i in %{buildroot}%{_bindir}/rst*; do mv "$i" "${i/.py}-python%{py3_ver}"; do %doc COPYING.txt FAQ.txt HISTORY.txt README.txt THANKS.txt BUGS.txt docs/* licenses %{_bindir}/rst*-python%{py3_ver} %{python3_sitelib}/* +%if 0%{?suse_version} <= 1140 +%dir %{python3_sitelib} +%endif %changelog