From 16945bc05d8551873e72296412e5955a267ad3bd9f8fa761c04e67ccf03149cd Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 4 Dec 2018 14:06:58 +0000 Subject: [PATCH 1/5] Remove superfluous devel dependency for noarch package OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinxcontrib-websupport?expand=0&rev=12 --- python-sphinxcontrib-websupport.changes | 5 +++++ python-sphinxcontrib-websupport.spec | 3 +-- python-sphinxcontrib.changes | 5 +++++ python-sphinxcontrib.spec | 3 +-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/python-sphinxcontrib-websupport.changes b/python-sphinxcontrib-websupport.changes index 3d33345..70fbe4f 100644 --- a/python-sphinxcontrib-websupport.changes +++ b/python-sphinxcontrib-websupport.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 4 13:09:44 UTC 2018 - Matej Cepl + +- Remove superfluous devel dependency for noarch package + ------------------------------------------------------------------- Thu Mar 8 10:21:43 UTC 2018 - aplanas@suse.com diff --git a/python-sphinxcontrib-websupport.spec b/python-sphinxcontrib-websupport.spec index fbe3a4e..26cc3a2 100644 --- a/python-sphinxcontrib-websupport.spec +++ b/python-sphinxcontrib-websupport.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -25,7 +25,6 @@ License: BSD-2-Clause Group: Development/Languages/Python Url: http://sphinx-doc.org/ Source: https://files.pythonhosted.org/packages/source/s/sphinxcontrib-websupport/sphinxcontrib-websupport-%{version}.tar.gz -BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module sphinxcontrib} BuildRequires: fdupes diff --git a/python-sphinxcontrib.changes b/python-sphinxcontrib.changes index 9fec6f5..a5f536c 100644 --- a/python-sphinxcontrib.changes +++ b/python-sphinxcontrib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 4 13:09:38 UTC 2018 - Matej Cepl + +- Remove superfluous devel dependency for noarch package + ------------------------------------------------------------------- Mon Sep 18 21:59:36 UTC 2017 - toddrme2178@gmail.com diff --git a/python-sphinxcontrib.spec b/python-sphinxcontrib.spec index f53980f..d3ba540 100644 --- a/python-sphinxcontrib.spec +++ b/python-sphinxcontrib.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -25,7 +25,6 @@ License: BSD-2-Clause Group: Development/Languages/Python Url: http://sphinx-doc.org/ Source: https://files.pythonhosted.org/packages/source/s/sphinxcontrib-websupport/sphinxcontrib-websupport-%{version}.tar.gz -BuildRequires: %{python_module devel} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildArch: noarch From bd835bccd1e8f413e7cac3eeb3ce487b8a22f1735cadd911c460523149a0f435 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 4 Dec 2018 17:23:45 +0000 Subject: [PATCH 2/5] Clean up the SPEC file OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinxcontrib-websupport?expand=0&rev=13 --- python-sphinxcontrib-websupport.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/python-sphinxcontrib-websupport.spec b/python-sphinxcontrib-websupport.spec index 26cc3a2..34dcf74 100644 --- a/python-sphinxcontrib-websupport.spec +++ b/python-sphinxcontrib-websupport.spec @@ -23,7 +23,7 @@ Release: 0 Summary: Sphinx API for Web Apps License: BSD-2-Clause Group: Development/Languages/Python -Url: http://sphinx-doc.org/ +URL: http://sphinx-doc.org/ Source: https://files.pythonhosted.org/packages/source/s/sphinxcontrib-websupport/sphinxcontrib-websupport-%{version}.tar.gz BuildRequires: %{python_module setuptools} BuildRequires: %{python_module sphinxcontrib} @@ -32,14 +32,13 @@ BuildRequires: python-rpm-macros Requires: python-Jinja2 Requires: python-six Requires: python-sphinxcontrib +BuildArch: noarch %if 0%{?suse_version} >= 1000 || 0%{?fedora_version} >= 24 Recommends: python-Sphinx +Suggests: python-SQLAlchemy Suggests: python-Whoosh Suggests: python-xapian -Suggests: python-SQLAlchemy %endif -BuildArch: noarch - %python_subpackages %description @@ -57,8 +56,8 @@ documentation into your Web application. %python_expand %fdupes %{buildroot}%{$python_sitelib} %files %{python_files} -%defattr(-,root,root,-) -%doc CHANGES LICENSE README.rst +%license LICENSE +%doc CHANGES README.rst %dir %{python_sitelib}/sphinxcontrib/ %{python_sitelib}/sphinxcontrib/websupport/ %{python_sitelib}/sphinxcontrib_websupport-%{version}-py*-nspkg.pth From 3cd552cb283cef32d5f9ef439ad5d8a3910c8447d128a3368b02ed424963d668 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 4 Dec 2018 18:11:43 +0000 Subject: [PATCH 3/5] Clean up the SPEC file. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinxcontrib-websupport?expand=0&rev=14 --- python-sphinxcontrib.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/python-sphinxcontrib.spec b/python-sphinxcontrib.spec index d3ba540..69e7a8a 100644 --- a/python-sphinxcontrib.spec +++ b/python-sphinxcontrib.spec @@ -23,12 +23,11 @@ Release: 0 Summary: Namespace for sphinxcontrib packages License: BSD-2-Clause Group: Development/Languages/Python -Url: http://sphinx-doc.org/ +URL: http://sphinx-doc.org/ Source: https://files.pythonhosted.org/packages/source/s/sphinxcontrib-websupport/sphinxcontrib-websupport-%{version}.tar.gz BuildRequires: fdupes BuildRequires: python-rpm-macros BuildArch: noarch - %python_subpackages %description @@ -50,8 +49,8 @@ $python -O -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/sp } %files %{python_files} -%defattr(-,root,root,-) -%doc CHANGES LICENSE README.rst +%license LICENSE +%doc CHANGES README.rst %dir %{python_sitelib}/sphinxcontrib/ %{python_sitelib}/sphinxcontrib/__init__.py* %pycache_only %dir %{python_sitelib}/sphinxcontrib/__pycache__/ From 3b7f7a42914a6f88a079dbc44f5a5f4f5283922fe3cf52fc5846f6a3ffa35f73 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 7 Dec 2018 21:00:32 +0000 Subject: [PATCH 4/5] Remove wrong BR on python-sphinxcontrib OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinxcontrib-websupport?expand=0&rev=15 --- python-sphinxcontrib-websupport.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/python-sphinxcontrib-websupport.spec b/python-sphinxcontrib-websupport.spec index 34dcf74..bfa43e4 100644 --- a/python-sphinxcontrib-websupport.spec +++ b/python-sphinxcontrib-websupport.spec @@ -26,12 +26,10 @@ Group: Development/Languages/Python URL: http://sphinx-doc.org/ Source: https://files.pythonhosted.org/packages/source/s/sphinxcontrib-websupport/sphinxcontrib-websupport-%{version}.tar.gz BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module sphinxcontrib} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-Jinja2 Requires: python-six -Requires: python-sphinxcontrib BuildArch: noarch %if 0%{?suse_version} >= 1000 || 0%{?fedora_version} >= 24 Recommends: python-Sphinx From 67026fbd8a6e5310259c0655d4c5a5e55834c4f1e1bee7347c03208758340727 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 12 Dec 2018 11:11:05 +0000 Subject: [PATCH 5/5] Remove package python-sphinxcontrib OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinxcontrib-websupport?expand=0&rev=16 --- python-sphinxcontrib.changes | 14 --------- python-sphinxcontrib.spec | 59 ------------------------------------ 2 files changed, 73 deletions(-) delete mode 100644 python-sphinxcontrib.changes delete mode 100644 python-sphinxcontrib.spec diff --git a/python-sphinxcontrib.changes b/python-sphinxcontrib.changes deleted file mode 100644 index a5f536c..0000000 --- a/python-sphinxcontrib.changes +++ /dev/null @@ -1,14 +0,0 @@ -------------------------------------------------------------------- -Tue Dec 4 13:09:38 UTC 2018 - Matej Cepl - -- Remove superfluous devel dependency for noarch package - -------------------------------------------------------------------- -Mon Sep 18 21:59:36 UTC 2017 - toddrme2178@gmail.com - -- Created base namespace package based on sphinxcontrib-websupport - sphinxcontrib-websupport is used since Sphinx depends on it, so - all other sphinxcontrib packages depend on it indirectly. - This avoids dependency loops between sphinxcontrib-websupport - and Sphinx. - diff --git a/python-sphinxcontrib.spec b/python-sphinxcontrib.spec deleted file mode 100644 index 69e7a8a..0000000 --- a/python-sphinxcontrib.spec +++ /dev/null @@ -1,59 +0,0 @@ -# -# spec file for package python-sphinxcontrib -# -# 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 -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via https://bugs.opensuse.org/ -# - - -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -Name: python-sphinxcontrib -Version: 1.0.1 -Release: 0 -Summary: Namespace for sphinxcontrib packages -License: BSD-2-Clause -Group: Development/Languages/Python -URL: http://sphinx-doc.org/ -Source: https://files.pythonhosted.org/packages/source/s/sphinxcontrib-websupport/sphinxcontrib-websupport-%{version}.tar.gz -BuildRequires: fdupes -BuildRequires: python-rpm-macros -BuildArch: noarch -%python_subpackages - -%description -This package provides the namespace that all sphinxcontrib packages -make use of. It shouldn't be installed directly, packages that -need it will pull it in automatically. - -%prep -%setup -q -n sphinxcontrib-websupport-%{version} - -%build -# Not used - -%install -%{python_expand install -D -m 644 sphinxcontrib/__init__.py %{buildroot}%{$python_sitelib}/sphinxcontrib/__init__.py -$python -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/sphinxcontrib/ -$python -O -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/sphinxcontrib/ -%fdupes %{buildroot}%{$python_sitelib} -} - -%files %{python_files} -%license LICENSE -%doc CHANGES README.rst -%dir %{python_sitelib}/sphinxcontrib/ -%{python_sitelib}/sphinxcontrib/__init__.py* -%pycache_only %dir %{python_sitelib}/sphinxcontrib/__pycache__/ -%pycache_only %{python_sitelib}/sphinxcontrib/__pycache__/__init__*.py* - -%changelog