From cbedcbe30b4e9585bc14caf18135d1a33dea085bc237c74c3c037c1029b34b2e Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 23 Sep 2011 10:27:18 +0000 Subject: [PATCH] Accepting request 84593 from devel:languages:go - Fixed build: * python-xml is only required on SUSE * pyxml is required on Fedora (and RHEL) OBS-URL: https://build.opensuse.org/request/show/84593 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-docutils?expand=0&rev=4 --- python-docutils.changes | 7 +++++++ python-docutils.spec | 15 +++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/python-docutils.changes b/python-docutils.changes index 8fff709..2fda18a 100644 --- a/python-docutils.changes +++ b/python-docutils.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 23 10:19:38 UTC 2011 - saschpe@suse.de + +- Fixed build: + * python-xml is only required on SUSE + * pyxml is required on Fedora (and RHEL) + ------------------------------------------------------------------- Wed Sep 21 10:15:51 UTC 2011 - saschpe@suse.de diff --git a/python-docutils.spec b/python-docutils.spec index f70e902..f140447 100644 --- a/python-docutils.spec +++ b/python-docutils.spec @@ -1,5 +1,5 @@ # -# spec file for package docutils +# spec file for package python-docutils # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -11,7 +11,7 @@ # 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/ # @@ -27,8 +27,14 @@ Group: Development/Languages/Python Source: http://downloads.sourceforge.net/project/docutils/docutils/0.8.1/docutils-0.8.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel +%if 0%{?suse_version} BuildRequires: python-xml Requires: python-xml +%endif +%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} +BuildRequires: pyxml +Requires: pyxml +%endif %if 0%{?suse_version} %py_requires %if 0%{?suse_version} > 1110 @@ -55,8 +61,9 @@ sed -i "1d" docutils/{math/math2html,_string_template_compat,error_reporting,wri python setup.py install --prefix=%{_prefix} --root=%{buildroot} for i in %{buildroot}%{_bindir}/rst*; do mv "$i" "${i/.py}"; done # Remove useless ".py" ending from executables -%if ! 0%{?sles_version} -# Tests break SLE builds +# Tests break SLE and Mandriva builds +%if ! 0%{?sles_version} && ! 0%{?mandriva_version} + %check cd test && python alltests.py %endif