From ecf20bd445e5137cd6bdaad99903fb9aa7bb9d7abd8be26db0ecce7fceff814a Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 18 Sep 2017 21:44:48 +0000 Subject: [PATCH] Accepting request 527135 from home:TheBlackCat:branches:devel:languages:python - Specify files to guarantee namespace package doesn't conflict with python(2|3)-Sphinx OBS-URL: https://build.opensuse.org/request/show/527135 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinxcontrib-programoutput?expand=0&rev=5 --- python-sphinxcontrib-programoutput.changes | 6 ++++++ python-sphinxcontrib-programoutput.spec | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/python-sphinxcontrib-programoutput.changes b/python-sphinxcontrib-programoutput.changes index 1ae8aa5..53da493 100644 --- a/python-sphinxcontrib-programoutput.changes +++ b/python-sphinxcontrib-programoutput.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 18 20:36:57 UTC 2017 - toddrme2178@gmail.com + +- Specify files to guarantee namespace package doesn't conflict + with python(2|3)-Sphinx + ------------------------------------------------------------------- Mon Apr 24 13:50:12 UTC 2017 - sebix+novell.com@sebix.at diff --git a/python-sphinxcontrib-programoutput.spec b/python-sphinxcontrib-programoutput.spec index 44e619d..441d144 100644 --- a/python-sphinxcontrib-programoutput.spec +++ b/python-sphinxcontrib-programoutput.spec @@ -27,10 +27,10 @@ Url: http://sphinxcontrib-programoutput.readthedocs.org/ Source: https://files.pythonhosted.org/packages/source/s/sphinxcontrib-programoutput/sphinxcontrib-programoutput-%{version}.tar.gz BuildRequires: %{python_module Sphinx} BuildRequires: %{python_module devel} -BuildRequires: %{python_module pytest} +BuildRequires: %{python_module setuptools} +BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-Sphinx -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %python_subpackages @@ -47,6 +47,7 @@ documents, helping you to keep your command examples up to date. %install %python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} #NOTE(saschpe): Running tests works but there's an UTF-8 issue I don't yet care about: #%%check @@ -55,6 +56,9 @@ documents, helping you to keep your command examples up to date. %files %{python_files} %defattr(-,root,root,-) %doc CHANGES.rst LICENSE README.rst -%{python_sitelib}/* +%dir %{python_sitelib}/sphinxcontrib/ +%{python_sitelib}/sphinxcontrib/programoutput/ +%{python_sitelib}/sphinxcontrib_programoutput-%{version}-py*-nspkg.pth +%{python_sitelib}/sphinxcontrib_programoutput-%{version}-py*.egg-info %changelog