diff --git a/python-colander.changes b/python-colander.changes index 42224d3..8b835c3 100644 --- a/python-colander.changes +++ b/python-colander.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Apr 20 13:05:17 UTC 2020 - Tomáš Chvátal + +- Obsolete the lang subpackage to avoid conflicts +- Do not generate docu twice, it is provided online by + upstream so we don't have to bother really at all + ------------------------------------------------------------------- Mon Apr 20 09:19:56 UTC 2020 - Matej Cepl diff --git a/python-colander.spec b/python-colander.spec index 775d762..7c3d63e 100644 --- a/python-colander.spec +++ b/python-colander.spec @@ -34,12 +34,11 @@ BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-iso8601 Requires: python-translationstring +Obsoletes: python2-colander-doc +Obsoletes: python2-colander-lang +Obsoletes: python3-colander-doc +Obsoletes: python3-colander-lang BuildArch: noarch -# SECTION documentation requirements -BuildRequires: %{python_module Sphinx} >= 1.3.1 -BuildRequires: %{python_module docutils} -BuildRequires: %{python_module pylons-sphinx-themes} -# /SECTION # SECTION test requirements BuildRequires: %{python_module coverage} BuildRequires: %{python_module hupper} @@ -59,54 +58,24 @@ An extensible package which can be used to: - serialize an arbitrary data structure to a data structure composed of strings, mappings, and lists. -It is tested on Python 2.7, 3.3, 3.4, 3.5, and 3.6, and PyPy. - -Please see http://docs.pylonsproject.org/projects/colander/en/latest/ -for documentation. - -%package doc -Summary: Documentation for %{name} -Requires: %{name} = %{version} - -%description doc -This package contains documentation files for %{name}. - -%package lang -# FIXME: consider using %%lang_package macro -Summary: Translations for package %{name} -Requires: %{name} = %{version} -Requires: python-base -Supplements: %{name} -Provides: %{name}-lang-all = %{version} -BuildArch: noarch - -%description lang -Provides translations for the "%{name}" package. - %prep %setup -q -n colander-%{version} %autopatch -p1 %build %python_build -%python_exec setup.py build_sphinx && rm build/sphinx/html/.buildinfo %install %python_install %find_lang colander -%python_expand grep -F "%{$python_sitelib}" colander.lang > colander_%{$python_bin_suffix}.lang %python_expand %fdupes %{buildroot}%{$python_sitelib} %check %pytest -%files %{python_files} -f colander_%{python_bin_suffix}.lang +%files %{python_files} %license LICENSE.txt %doc CHANGES.rst README.rst %{python_sitelib}/colander* -%files %{python_files doc} -%license LICENSE.txt -%doc build/sphinx/html - %changelog