From 3769604cc92048c787e33c51d92379ad77a53ae3478887e069ed18ffa15ace14 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 18 Sep 2017 20:01:07 +0000 Subject: [PATCH 1/2] Accepting request 527075 from home:TheBlackCat:branches:devel:languages:python - Fix conflicts with python-Sphinx OBS-URL: https://build.opensuse.org/request/show/527075 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinxcontrib-asyncio?expand=0&rev=3 --- python-sphinxcontrib-asyncio.changes | 5 +++++ python-sphinxcontrib-asyncio.spec | 15 +++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/python-sphinxcontrib-asyncio.changes b/python-sphinxcontrib-asyncio.changes index 5e0510c..90c55bf 100644 --- a/python-sphinxcontrib-asyncio.changes +++ b/python-sphinxcontrib-asyncio.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 18 16:33:47 UTC 2017 - toddrme2178@gmail.com + +- Fix conflicts with python-Sphinx + ------------------------------------------------------------------- Thu Aug 24 10:04:34 UTC 2017 - sebix+novell.com@sebix.at diff --git a/python-sphinxcontrib-asyncio.spec b/python-sphinxcontrib-asyncio.spec index 1fa25ce..a272b7f 100644 --- a/python-sphinxcontrib-asyncio.spec +++ b/python-sphinxcontrib-asyncio.spec @@ -16,7 +16,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%bcond_without test +%bcond_with test Name: python-sphinxcontrib-asyncio Version: 0.2.0 Release: 0 @@ -30,11 +30,10 @@ BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python3-Sphinx -# SECTION test requirements %if %{with test} BuildRequires: %{python_module pytest} %endif -# /SECTION +Requires: python-Sphinx BuildArch: noarch %python_subpackages @@ -56,8 +55,16 @@ popd %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} +# Remove sphinxcontrib namespace package files provided by python-Sphinx +%python_expand rm -f %{buildroot}%{$python_sitelib}/sphinxcontrib/__init__.py* +%python_expand rm -f %{buildroot}%{$python_sitelib}/sphinxcontrib/__pycache__/__init__*.py* + %files %{python_files} %doc CHANGES.rst README.rst docs/_build/html -%{python_sitelib}/* +%dir %{python_sitelib}/sphinxcontrib/ +%{python_sitelib}/sphinxcontrib/asyncio.py* +%pycache_only %dir %{python_sitelib}/sphinxcontrib/__pycache__/ +%pycache_only %{python_sitelib}/sphinxcontrib/__pycache__/asyncio*.py* +%{python_sitelib}/sphinxcontrib_asyncio-%{version}-py*.egg-info %changelog From 1271c63d159f9c78863490d863e4d6b516dc97444a0ac49f54aa2126780bac0b Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Tue, 19 Sep 2017 08:27:33 +0000 Subject: [PATCH 2/2] Accepting request 527178 from home:TheBlackCat:branches:devel:languages:python - Use new python-sphinxcontrib package to provide namespace directory. OBS-URL: https://build.opensuse.org/request/show/527178 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinxcontrib-asyncio?expand=0&rev=4 --- python-sphinxcontrib-asyncio.changes | 6 ++++++ python-sphinxcontrib-asyncio.spec | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/python-sphinxcontrib-asyncio.changes b/python-sphinxcontrib-asyncio.changes index 90c55bf..6cf3a7d 100644 --- a/python-sphinxcontrib-asyncio.changes +++ b/python-sphinxcontrib-asyncio.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 18 22:29:06 UTC 2017 - toddrme2178@gmail.com + +- Use new python-sphinxcontrib package to provide namespace + directory. + ------------------------------------------------------------------- Mon Sep 18 16:33:47 UTC 2017 - toddrme2178@gmail.com diff --git a/python-sphinxcontrib-asyncio.spec b/python-sphinxcontrib-asyncio.spec index a272b7f..3418891 100644 --- a/python-sphinxcontrib-asyncio.spec +++ b/python-sphinxcontrib-asyncio.spec @@ -25,15 +25,18 @@ Summary: Sphinx extension to support coroutines in markup Url: https://github.com/aio-libs/sphinxcontrib-asyncio Group: Development/Languages/Python Source: https://files.pythonhosted.org/packages/source/s/sphinxcontrib-asyncio/sphinxcontrib-asyncio-%{version}.tar.gz -BuildRequires: python-rpm-macros BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module sphinxcontrib} BuildRequires: fdupes +BuildRequires: python-rpm-macros BuildRequires: python3-Sphinx %if %{with test} +BuildRequires: %{python_module Sphinx} BuildRequires: %{python_module pytest} %endif Requires: python-Sphinx +Requires: python-sphinxcontrib BuildArch: noarch %python_subpackages @@ -61,7 +64,6 @@ popd %files %{python_files} %doc CHANGES.rst README.rst docs/_build/html -%dir %{python_sitelib}/sphinxcontrib/ %{python_sitelib}/sphinxcontrib/asyncio.py* %pycache_only %dir %{python_sitelib}/sphinxcontrib/__pycache__/ %pycache_only %{python_sitelib}/sphinxcontrib/__pycache__/asyncio*.py*