From e7679e01c847ab132f9e097ba83a51ebfb18885bf6f563abbe9ed0077b70de62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 23 Jan 2018 14:14:50 +0000 Subject: [PATCH] Accepting request 568583 from home:dimstar:Factory Fix build with RPM 4.14 - disabling the doc was the easy way out, and we don't even lose anything to what we had: make html failed already before; this allows SLE15 to move forward, doc can be introduced again later if wanted OBS-URL: https://build.opensuse.org/request/show/568583 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-gevent?expand=0&rev=34 --- python-gevent.changes | 8 ++++++++ python-gevent.spec | 7 ++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/python-gevent.changes b/python-gevent.changes index c8d603c..bfe4157 100644 --- a/python-gevent.changes +++ b/python-gevent.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jan 23 13:34:36 UTC 2018 - dimstar@opensuse.org + +- Disable building of the documentation: the make html call fails + already, and with rpm 4.14, this aborts the entire build. +- Drop python-Sphinx buildrequires: not needed when not building + the docs. + ------------------------------------------------------------------- Wed Nov 22 15:29:26 UTC 2017 - jmatejek@suse.com diff --git a/python-gevent.spec b/python-gevent.spec index 5614d75..3f32fbf 100644 --- a/python-gevent.spec +++ b/python-gevent.spec @@ -1,7 +1,7 @@ # # spec file for package python-gevent # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,8 +35,6 @@ BuildRequires: %{python_module greenlet} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -# Documentation requirements -BuildRequires: python-Sphinx %if %{with tests} BuildRequires: %{python_module nose} %endif @@ -76,7 +74,7 @@ Documentation and examples for %{name}. %build %python_build -cd doc && make html && rm _build/html/.buildinfo # Build HTML documentation +#cd doc && make html && rm _build/html/.buildinfo # Build HTML documentation %install %python_install @@ -99,6 +97,5 @@ popd %files -n python-gevent-doc %defattr(-,root,root,-) %doc examples/ -%doc doc/_build/html %changelog