From 83ef806690adfad9e2a8f020ca56e7d7d36793c39089692ef5c196ccc9c6e26c Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Thu, 18 Jul 2013 09:13:10 +0000 Subject: [PATCH 1/4] - Drop runtime req on python-distribute OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=34 --- python-Sphinx.changes | 5 +++++ python-Sphinx.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/python-Sphinx.changes b/python-Sphinx.changes index 71c6d19..68b6e48 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 18 09:15:10 UTC 2013 - speilicke@suse.com + +- Drop runtime req on python-distribute + ------------------------------------------------------------------- Tue Jul 9 14:16:18 UTC 2013 - dmueller@suse.com diff --git a/python-Sphinx.spec b/python-Sphinx.spec index 02978f5..7cc8dc2 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -38,7 +38,6 @@ Requires(post): update-alternatives Requires(postun): update-alternatives Requires: python-Jinja2 Requires: python-Pygments -Requires: python-distribute Requires: python-docutils Suggests: python-rst2pdf Provides: python-sphinx = %{version} From fdaf164829294cccb417d55de3b8261acd11d00bb68063030bccc127f4bf0ee0 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Mon, 16 Sep 2013 09:26:51 +0000 Subject: [PATCH 2/4] - Make sure %python_sitelib/sphinxcontrib is an importable module. Some 3rd-party extensions assume this OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=35 --- python-Sphinx.changes | 6 ++++++ python-Sphinx.spec | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/python-Sphinx.changes b/python-Sphinx.changes index 68b6e48..e420123 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 16 09:26:11 UTC 2013 - speilicke@suse.com + +- Make sure %python_sitelib/sphinxcontrib is an importable module. + Some 3rd-party extensions assume this + ------------------------------------------------------------------- Thu Jul 18 09:15:10 UTC 2013 - speilicke@suse.com diff --git a/python-Sphinx.spec b/python-Sphinx.spec index 7cc8dc2..054ff8b 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -101,6 +101,12 @@ for M in all apidoc build quickstart ; do ln -s %{_mandir}/man1/sphinx-$M-%{py_ver}.1 %{buildroot}%{_mandir}/man1/sphinx-$M.1 done %find_lang sphinx +# Create extensions module. Extensions usually create subdirectories with an +# __init__.py file there (and hence are importable python modules). But some +# install a single *.py file into that dir and assume it's already a Python +# module. +install -d %{buildroot}%{python_sitelib}/sphinxcontrib +touch %{buildroot}%{python_sitelib}/sphinxcontrib/__init__.py %check nosetests @@ -153,7 +159,8 @@ fi %{_mandir}/man1/sphinx-build-%{py_ver}.1.gz %ghost %{_mandir}/man1/sphinx-quickstart.1.gz %{_mandir}/man1/sphinx-quickstart-%{py_ver}.1.gz -%{python_sitelib}/sphinx +%{python_sitelib}/sphinx/ +%{python_sitelib}/sphinxcontrib/ %{python_sitelib}/Sphinx-%{version}-py%{py_ver}.egg-info %files doc From 933f53a54b72471739640e2ffb1ee01afb19b8337c6014d7e905407ea5706621 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Mon, 16 Sep 2013 13:39:00 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=36 --- python-Sphinx.changes | 6 ------ 1 file changed, 6 deletions(-) diff --git a/python-Sphinx.changes b/python-Sphinx.changes index e420123..68b6e48 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Mon Sep 16 09:26:11 UTC 2013 - speilicke@suse.com - -- Make sure %python_sitelib/sphinxcontrib is an importable module. - Some 3rd-party extensions assume this - ------------------------------------------------------------------- Thu Jul 18 09:15:10 UTC 2013 - speilicke@suse.com From 40ddee7c63a4bd621b945a0347698779c06b0de471e9a8859e5c90018b5e13bd Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Mon, 16 Sep 2013 13:40:02 +0000 Subject: [PATCH 4/4] revert OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=37 --- python-Sphinx.spec | 7 ------- 1 file changed, 7 deletions(-) diff --git a/python-Sphinx.spec b/python-Sphinx.spec index 054ff8b..c767ef9 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -101,12 +101,6 @@ for M in all apidoc build quickstart ; do ln -s %{_mandir}/man1/sphinx-$M-%{py_ver}.1 %{buildroot}%{_mandir}/man1/sphinx-$M.1 done %find_lang sphinx -# Create extensions module. Extensions usually create subdirectories with an -# __init__.py file there (and hence are importable python modules). But some -# install a single *.py file into that dir and assume it's already a Python -# module. -install -d %{buildroot}%{python_sitelib}/sphinxcontrib -touch %{buildroot}%{python_sitelib}/sphinxcontrib/__init__.py %check nosetests @@ -160,7 +154,6 @@ fi %ghost %{_mandir}/man1/sphinx-quickstart.1.gz %{_mandir}/man1/sphinx-quickstart-%{py_ver}.1.gz %{python_sitelib}/sphinx/ -%{python_sitelib}/sphinxcontrib/ %{python_sitelib}/Sphinx-%{version}-py%{py_ver}.egg-info %files doc