From 3463f6252d156b03c98c9ff587b5522496b2a36c4aefc689af57c0ae15bacafa Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 27 Jul 2015 14:32:26 +0000 Subject: [PATCH 1/2] Accepting request 318952 from home:seife:OpenStack:Master fix build on CentOS/RHEL OBS-URL: https://build.opensuse.org/request/show/318952 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=59 --- python-Sphinx.changes | 6 ++++++ python-Sphinx.spec | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/python-Sphinx.changes b/python-Sphinx.changes index 0acc4e7..b1c39b6 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 27 09:03:41 UTC 2015 - seife+obs@b1-systems.com + +- fix build on CentOS/RHEL by conditionalizing Recommends: tag +- add #!BuildIgnore: texinfo to work around CentOS-7 project config + ------------------------------------------------------------------- Mon Jun 29 14:07:26 UTC 2015 - toddrme2178@gmail.com diff --git a/python-Sphinx.spec b/python-Sphinx.spec index 42f69c1..a480a6a 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -1,7 +1,7 @@ # # spec file for package python-Sphinx # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -49,7 +49,12 @@ Requires: python-docutils >= 0.11 Requires: python-six Requires: python-snowballstemmer Requires: python-sphinx_rtd_theme +%if 0%{?suse_version} Recommends: python-rst2pdf +%endif +# workaround for suboptimal CentOS-7 project config +#!BuildIgnore: texinfo + Provides: python-sphinx = %{version} Obsoletes: python-sphinx < %{version} %if 0%{?suse_version} && 0%{?suse_version} <= 1110 From f748cef8f13ddc06e56893ba7e5d1eeee82212d2827c940dc8ddd97f65f135a7 Mon Sep 17 00:00:00 2001 From: Todd R Date: Wed, 29 Jul 2015 13:26:03 +0000 Subject: [PATCH 2/2] Accepting request 319414 from home:frispete:python minor change, but tired of carrying around... OBS-URL: https://build.opensuse.org/request/show/319414 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=60 --- python-Sphinx.changes | 5 +++++ python-Sphinx.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/python-Sphinx.changes b/python-Sphinx.changes index b1c39b6..1b6ee0d 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 29 13:18:28 UTC 2015 - hpj@urpla.net + +- Be explicit about six version requirements + ------------------------------------------------------------------- Mon Jul 27 09:03:41 UTC 2015 - seife+obs@b1-systems.com diff --git a/python-Sphinx.spec b/python-Sphinx.spec index a480a6a..dd6f8ee 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -33,7 +33,7 @@ BuildRequires: python-Jinja2 >= 2.3 BuildRequires: python-alabaster BuildRequires: python-docutils >= 0.7 BuildRequires: python-mock -BuildRequires: python-six +BuildRequires: python-six >= 1.4 BuildRequires: python-snowballstemmer BuildRequires: python-sphinx_rtd_theme # Testsuite requirements: @@ -46,7 +46,7 @@ Requires: python-Jinja2 >= 2.3 Requires: python-Pygments >= 2.0 Requires: python-alabaster Requires: python-docutils >= 0.11 -Requires: python-six +Requires: python-six >= 1.4 Requires: python-snowballstemmer Requires: python-sphinx_rtd_theme %if 0%{?suse_version}