diff --git a/python-pyramid.changes b/python-pyramid.changes index df9b3ee..ead478a 100644 --- a/python-pyramid.changes +++ b/python-pyramid.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 8 16:31:46 UTC 2017 - toddrme2178@gmail.com + +- Remove non-free documentation (CC-BY-NC-SA-3.0 license). + ------------------------------------------------------------------- Thu Sep 7 15:57:20 UTC 2017 - toddrme2178@gmail.com diff --git a/python-pyramid.spec b/python-pyramid.spec index b5923e6..0e53941 100644 --- a/python-pyramid.spec +++ b/python-pyramid.spec @@ -18,6 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%bcond_without test Name: python-pyramid Version: 1.9.1 Release: 0 @@ -34,14 +35,9 @@ BuildRequires: %{python_module translationstring} >= 0.4 BuildRequires: %{python_module venusian} >= 1.0 BuildRequires: %{python_module zope.deprecation} >= 3.5.0 BuildRequires: %{python_module zope.interface} >= 3.8.0 -# SECTION documentation requirements -BuildRequires: python3-Sphinx >= 1.3.5 -BuildRequires: python3-docutils -BuildRequires: python3-pylons-sphinx-themes -BuildRequires: python3-repoze.sphinx.autointerface -BuildRequires: python3-sphinxcontrib-autoprogram -# /SECTION -# SECTION testing requirements +BuildRequires: fdupes +BuildRequires: python-rpm-macros +%if %{with test} BuildRequires: %{python_module WebTest} >= 1.3.1 BuildRequires: %{python_module coverage} BuildRequires: %{python_module hupper} @@ -49,9 +45,7 @@ BuildRequires: %{python_module nose} BuildRequires: %{python_module plaster-pastedeploy} BuildRequires: %{python_module plaster} BuildRequires: %{python_module zope.component} >= 4.0 -# /SECTION -BuildRequires: fdupes -BuildRequires: python-rpm-macros +%endif Requires: python-PasteDeploy >= 1.5.0 Requires: python-WebOb >= 1.7.0 Requires: python-repoze.lru >= 0.4 @@ -70,13 +64,8 @@ Pyramid is a Python web application development framework produced by the Pylons Project (http://pylonsproject.org). It was previously known as repoze.bfg (http://bfg.repoze.org). -%package -n %{name}-doc -Summary: Documentation for %{name} -Group: Documentation/HTML -Provides: %{python_module pyramid-doc = %{version}} - -%description -n %{name}-doc -This package contains documentation files for %{name}. +# NOTE: The documentation in the docs/ directory is under a +# non-free license (CC-BY-NC-SA-3.0). Do not package it. %prep %setup -q -n pyramid-%{version} @@ -87,7 +76,6 @@ touch -r pyramid/__init__.py pyramid/scaffolds/alchemy/+package+/scripts/__init_ %build %python_build %{_python_use_flavor python3} -%__python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo %install %python_install @@ -99,9 +87,11 @@ for p in pcreate pdistreport prequest proutes pserve pshell ptweens pviews; do %python_clone -a %{buildroot}%{_bindir}/$p done +%if %{with test} %check export LANG=en_US.UTF-8 -%python_expand $python setup.py nosetests --with-coverage -vvv +%python_exec setup.py nosetests --with-coverage -vvv +%endif %post %python_install_alternative pcreate pdistreport prequest proutes pserve pshell ptweens pviews @@ -122,8 +112,4 @@ export LANG=en_US.UTF-8 %python_alternative %{_bindir}/pviews %{python_sitelib}/* -%files -n %{name}-doc -%defattr(-,root,root,-) -%doc build/sphinx/html - %changelog