- updated to 9.0

- added python3 module and apidocs

diff --git a/python-keyring.spec b/python-keyring.spec
index d26e776cc9f5994b299dd9c85193354f4709c013..515a3807aa23140b49cfbc1d79751395afeffe8d 100644 (file)
--- a/python-keyring.spec
+++ b/python-keyring.spec
@@ -1,58 +1,152 @@
+#
+# Conditional build:
+%bcond_without doc     # Sphinx documentation
+%bcond_with    tests   # test target [broken with \--build-base]
+%bcond_without python2 # CPython 2.x module
+%bcond_without python3 # CPython 3.x module
+
 %define        module  keyring
-Summary:       Python library to access the system keyring service
+Summary:       Python 2 library to access the system keyring service
+Summary(pl.UTF-8):     Biblioteka Pythona 2 do dostępu do systemowego pęku kluczy
 Name:          python-%{module}
-Version:       0.6.2
-Release:       2
-Source0:       http://pypi.python.org/packages/source/k/keyring/%{module}-%{version}.tar.gz
-# Source0-md5: b21b5783c375fc09abdc060b4edc062f
-License:       Python
-Group:         Development/Libraries
-URL:           http://pypi.python.org/pypi/keyring
-BuildRequires: python-devel
+Version:       9.0
+Release:       1
+License:       MIT, PSF
+Group:         Libraries/Python
+Source0:       https://pypi.python.org/packages/source/k/keyring/%{module}-%{version}.tar.gz
+# Source0-md5: 7b88030ba5936e95b71c04a069ba111c
+URL:           https://pypi.python.org/pypi/keyring
 BuildRequires: rpmbuild(macros) >= 1.710
-# CryptedFileKeyring
-Suggests:      python-Crypto
-# KDEKWallet
-Suggests:      python-PyKDE4
-# GnomeKeyring
-Suggests:      python-gnome-desktop-keyring
+%if %{with python2}
+BuildRequires: python-devel >= 1:2.7
+BuildRequires: python-setuptools
+BuildRequires: python-setuptools_scm >= 1.9
+%if %{with tests}
+BuildRequires: python-pytest >= 2.8
+BuildRequires: python-pytest-runner
+%endif
+%endif
+%if %{with python3}
+BuildRequires: python3-devel >= 1:3.2
+BuildRequires: python3-setuptools
+BuildRequires: python3-setuptools_scm >= 1.9
+%if %{with tests}
+BuildRequires: python3-pytest >= 2.8
+BuildRequires: python3-pytest-runner
+%endif
+%endif
+%if %{with doc}
+BuildRequires: python3-Sphinx
+BuildRequires: python3-rst.linker
+%endif
+Requires:      python-modules >= 1:2.7
+# kwalletd5 through dbus
+Suggests:      python-dbus
+# SecretService
+Suggests:      python-secretstorage
 Obsoletes:     python-keyring-gnome < 0.5.1
 Obsoletes:     python-keyring-kwallet < 0.5.1
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
+The Python keyring library provides a easy way to access the system
+keyring service from Python. It can be used in any application that
+needs safe password storage.
+
+%description -l pl.UTF-8
+Biblioteka Pythona keyring udostępnia prosty sposób dostępu do usługi
+systemowego pęku kluczy z poziomu Pythona. Może być używana w dowolnej
+aplikacji wymagającej bezpiecznego przechowywania haseł.
+
+%package -n python3-%{module}
+Summary:       Python 3 library to access the system keyring service
+Summary(pl.UTF-8):     Biblioteka Pythona 3 do dostępu do systemowego pęku kluczy
+Group:         Libraries/Python
+Requires:      python3-modules >= 1:3.3
+# kwalletd5 through dbus
+Suggests:      python-dbus
+# SecretService
+Suggests:      python-secretstorage
+
+%description -n python3-%{module}
 The Python keyring lib provides a easy way to access the system
-keyring service from python. It can be used in any application that
+keyring service from Python. It can be used in any application that
 needs safe password storage.
 
-This package only provides file-based pseudo-keyrings. To interface
-with gnome-keyring or KWallet, please install one of
-python-keyring-gnome or python-keyring-kwallet.
+%description -n python3-%{module} -l pl.UTF-8
+Biblioteka Pythona keyring udostępnia prosty sposób dostępu do usługi
+systemowego pęku kluczy z poziomu Pythona. Może być używana w dowolnej
+aplikacji wymagającej bezpiecznego przechowywania haseł.
+
+%package apidocs
+Summary:       API documentation for Python keyring library
+Summary(pl.UTF-8):     Dokumentacja API biblioteki Pythona keyring
+Group:         Documentation
+
+%description apidocs
+API documentation for Python keyring library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki Pythona keyring.
 
 %prep
 %setup -q -n %{module}-%{version}
 
 %build
-%py_build
+%if %{with python2}
+%py_build %{?with_tests:test}
+%endif
+
+%if %{with python3}
+%py3_build %{?with_tests:test} %{?with_doc:build_sphinx}
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%py_install
 
-%{__rm} -r $RPM_BUILD_ROOT%{py_sitescriptdir}/%{module}/tests
+%if %{with python3}
+%py3_install
 
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-cp -a demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+%{__rm} -r $RPM_BUILD_ROOT%{py3_sitescriptdir}/%{module}/tests
+# "keyring" name is too generic, add -py[version] suffix
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/keyring{,-py3}
+%endif
+
+%if %{with python2}
+%py_install
 
 %py_postclean
+%{__rm} -r $RPM_BUILD_ROOT%{py_sitescriptdir}/%{module}/tests
+# "keyring" name is too generic, add -py[version] suffix
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/keyring{,-py2}
+ln -sf keyring-py2 $RPM_BUILD_ROOT%{_bindir}/keyring-py
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if %{with python2}
 %files
 %defattr(644,root,root,755)
-%doc CHANGES.txt CONTRIBUTORS.txt README
-%{py_sitescriptdir}/%{module}
-%{py_sitescriptdir}/%{module}-*.egg-info
-%{_examplesdir}/%{name}-%{version}
+%doc CHANGES.rst README.rst
+%attr(755,root,root) %{_bindir}/keyring-py
+%attr(755,root,root) %{_bindir}/keyring-py2
+%{py_sitescriptdir}/keyring
+%{py_sitescriptdir}/keyring-%{version}-py*.egg-info
+%endif
+
+%if %{with python3}
+%files -n python3-%{module}
+%defattr(644,root,root,755)
+%doc CHANGES.rst README.rst
+%attr(755,root,root) %{_bindir}/keyring-py3
+%{py3_sitescriptdir}/keyring
+%{py3_sitescriptdir}/keyring-%{version}-py*.egg-info
+%endif
+
+%if %{with python3} && %{with doc}
+%files apidocs
+%defattr(644,root,root,755)
+%doc build-3/sphinx/html/{_static,*.html,*.js}
+%endif