- cleanups, descriptions etc.; release 7

diff --git a/python-itsdangerous.spec b/python-itsdangerous.spec
index 7fc53456c59b4529251bd99ed58fa5a6822ecc84..4b6b48c1f057aa9c7f75eaeca35c980a71098259 100644 (file)
--- a/python-itsdangerous.spec
+++ b/python-itsdangerous.spec
@@ -1,33 +1,34 @@
 #
 # Conditional build:
-%bcond_without doc             # don't build doc
-%bcond_without tests   # do not perform "make test"
+%bcond_without doc     # Sphinx documentation
+%bcond_without tests   # unit tests
 %bcond_without python2 # CPython 2.x module
 %bcond_without python3 # CPython 3.x module
 
 %define        module  itsdangerous
 Summary:       Various helpers to pass trusted data to untrusted environments and back
-Summary(pl.UTF-8):     Wspomaganie przekazywania danych do i z niebezpiecznych środowisk
+Summary(pl.UTF-8):     Wspomaganie przekazywania danych do i z niezaufanych środowisk
 Name:          python-%{module}
 Version:       0.24
-Release:       6
+Release:       7
 License:       BSD
 Group:         Libraries/Python
-Source0:       http://pypi.python.org/packages/source/i/%{module}/%{module}-%{version}.tar.gz
+#Source0Download: https://pypi.python.org/simple/itsdangerous
+Source0:       http://pypi.python.org/packages/source/i/itsdangerous/%{module}-%{version}.tar.gz
 # Source0-md5: a3d55aa79369aef5345c036a8a26307f
 URL:           http://github.com/mitsuhiko/itsdangerous
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.710
 %if %{with python2}
-BuildRequires: python-devel
-BuildRequires: python-distribute
+BuildRequires: python-devel >= 2
+BuildRequires: python-setuptools
 %endif
 %if %{with python3}
-BuildRequires: python3-devel
-BuildRequires: python3-distribute
-BuildRequires: python3-modules
+BuildRequires: python3-devel >= 1:3.2
+BuildRequires: python3-modules >= 1:3.2
+BuildRequires: python3-setuptools
 %endif
-Requires:      python-modules
+Requires:      python-modules >= 2
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -35,33 +36,38 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Various helpers to pass data to untrusted environments and to get it
 back safe and sound.
 
-# %description -l pl.UTF-8
+%description -l pl.UTF-8
+Funkcje pomocnicze do przekazywania danych do niezaufanych środowisk i
+pobierania ich w sposób bezpieczny.
 
 %package -n python3-%{module}
 Summary:       Various helpers to pass data to untrusted environments and to get it back safe and sound
 Summary(pl.UTF-8):     Wspomaganie przekazywania danych do i z niebezpiecznych środowisk
 Group:         Libraries/Python
-Requires:      python3-modules
+Requires:      python3-modules >= 1:3.2
 
 %description -n python3-%{module}
+Various helpers to pass data to untrusted environments and to get it
+back safe and sound.
 
 %description -n python3-%{module} -l pl.UTF-8
+Funkcje pomocnicze do przekazywania danych do niezaufanych środowisk i
+pobierania ich w sposób bezpieczny.
 
 %package apidocs
-Summary:       %{module} API documentation
-Summary(pl.UTF-8):     Dokumentacja API %{module}
+Summary:       Documentation for Python itsdangerous module
+Summary(pl.UTF-8):     Dokumentacja do moduły Pythona itsdangerous
 Group:         Documentation
 
 %description apidocs
-API documentation for %{module}.
+Documentation for Python itsdangerous module.
 
 %description apidocs -l pl.UTF-8
-Dokumentacja API %{module}.
+Dokumentacja do moduły Pythona itsdangerous.
 
 %prep
 %setup -q -n %{module}-%{version}
 
-
 %build
 %if %{with python2}
 %py_build %{?with_tests:test}
@@ -72,9 +78,7 @@ Dokumentacja API %{module}.
 %endif
 
 %if %{with doc}
-cd docs
-%{__make} -j1 html
-rm -rf _build/html/_sources
+%{__make} -C docs html
 %endif
 
 %install
@@ -96,24 +100,24 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python2}
 %files
 %defattr(644,root,root,755)
-# %doc AUTHORS CREDITS ChangeLog NEWS README THANKS TODO
-%{py_sitescriptdir}/%{module}.py[co]
+%doc CHANGES LICENSE README
+%{py_sitescriptdir}/itsdangerous.py[co]
 %if "%{py_ver}" > "2.4"
-%{py_sitescriptdir}/%{module}-%{version}-py*.egg-info
+%{py_sitescriptdir}/itsdangerous-%{version}-py*.egg-info
 %endif
 %endif
 
 %if %{with python3}
 %files -n python3-%{module}
 %defattr(644,root,root,755)
-# %doc AUTHORS CHANGES LICENSE
-%{py3_sitescriptdir}/%{module}.py
-%{py3_sitescriptdir}/__pycache__/*.py[co]
-%{py3_sitescriptdir}/%{module}-%{version}-py*.egg-info
+%doc CHANGES LICENSE README
+%{py3_sitescriptdir}/itsdangerous.py
+%{py3_sitescriptdir}/__pycache__/itsdangerous.cpython-*.py[co]
+%{py3_sitescriptdir}/itsdangerous-%{version}-py*.egg-info
 %endif
 
 %if %{with doc}
 %files apidocs
 %defattr(644,root,root,755)
-%doc docs/_build/html/*
+%doc docs/_build/html/{_static,*.html,*.js}
 %endif