X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=python-cryptography.spec;h=219e6ee6371b259f9a4b7238f8d4f0f52925e47b;hb=cddf28e56a0cbb59517a80e75f38b41cee23cf1e;hp=c0849e9fdf5de63ed643f5eb20c3782cebcfc754;hpb=8dd4e35f940e30fb033dee4ad9c325f6837d98f9;p=packages%2Fpython3-cryptography.git

diff --git a/python-cryptography.spec b/python-cryptography.spec
index c0849e9..219e6ee 100644
--- a/python-cryptography.spec
+++ b/python-cryptography.spec
@@ -1,71 +1,75 @@
+# TODO: when updating try to reenable all tests (two were failing in 2.7 with openssl 1.1.1d)
 #
 # Conditional build:
 %bcond_without	python2	# CPython 2.x module
 %bcond_without	python3	# CPython 3.x module
-%bcond_with	tests	# test target [not all dependencies are currently available in PLD]
+%bcond_without	doc	# Sphinx documentation
+%bcond_without	tests	# unit test
 
 Summary:	Crypthography library for Python 2
 Summary(pl.UTF-8):	Biblioteka Cryptography dla Pythona 2
 Name:		python-cryptography
-Version:	1.3.1
-Release:	2
+Version:	2.8
+Release:	1
 License:	Apache v2.0 or BSD
 Group:		Libraries/Python
-#Source0Download: https://pypi.python.org/simple/cryptography/
-Source0:	https://pypi.python.org/packages/source/c/cryptography/cryptography-%{version}.tar.gz
-# Source0-md5:	bc8148d2ff2d80fef8ef2d2e856b3a7f
+#Source0Download: https://pypi.org/simple/cryptography/
+Source0:	https://files.pythonhosted.org/packages/source/c/cryptography/cryptography-%{version}.tar.gz
+# Source0-md5:	77730058b556c6d9838679a94c6229ce
+#Source1Download: https://pypi.org/simple/cryptography_vectors/
+Source1:	https://files.pythonhosted.org/packages/source/c/cryptography-vectors/cryptography_vectors-%{version}.tar.gz
+# Source1-md5:	a744ed29bb9ef56b3a50317fea3b218e
 URL:		https://cryptography.io/
-BuildRequires:	openssl-devel >= 0.9.8
-BuildRequires:	rpm-pythonprov
+BuildRequires:	openssl-devel >= 1.0.1
+BuildRequires:	rpm-pythonprov >= 5.4.15-48
 BuildRequires:	rpmbuild(macros) >= 1.714
 %if %{with python2}
-BuildRequires:	python-cffi >= 1.4.1
-BuildRequires:	python-devel >= 1:2.6
+BuildRequires:	python-cffi >= 1.8
+BuildRequires:	python-devel >= 1:2.7
 BuildRequires:	python-enum34
-BuildRequires:	python-pyasn1 >= 0.1.8
-BuildRequires:	python-setuptools >= 11.3
+BuildRequires:	python-pytz
+BuildRequires:	python-setuptools >= 18.5
 BuildRequires:	python-six >= 1.4.1
 %if %{with tests}
-BuildRequires:	python-cryptography_vectors
+BuildRequires:	python-asn1crypto >= 0.21.0
 %if "%{py_ver}" >= "2.7"
 BuildRequires:	python-hypothesis >= 1.11.4
 %endif
-BuildRequires:	python-idna >= 2.0
+BuildRequires:	python-idna >= 2.1
 BuildRequires:	python-ipaddress
 BuildRequires:	python-iso8601
 BuildRequires:	python-pretend
-BuildRequires:	python-pyasn1_modules
-BuildRequires:	python-pytest
+BuildRequires:	python-pytest >= 3.6.0
+BuildRequires:	python-pytz
 %endif
 %endif
 %if %{with python3}
-BuildRequires:	python3-cffi >= 1.4.1
-BuildRequires:	python3-devel >= 1:3.3
-%if "%{py3_ver}" < "3.4"
-BuildRequires:	python3-enum34
-%endif
-BuildRequires:	python3-pyasn1 >= 0.1.8
-BuildRequires:	python3-setuptools >= 11.3
+BuildRequires:	python3-cffi >= 1.8
+BuildRequires:	python3-devel >= 1:3.4
+BuildRequires:	python3-setuptools >= 18.5
 BuildRequires:	python3-six >= 1.4.1
 %if %{with tests}
-BuildRequires:	python3-cryptography_vectors
+BuildRequires:	python3-asn1crypto >= 0.21.0
 BuildRequires:	python3-hypothesis >= 1.11.4
-BuildRequires:	python3-idna >= 2.0
+BuildRequires:	python3-idna >= 2.1
 BuildRequires:	python3-iso8601
 BuildRequires:	python3-pretend
-BuildRequires:	python3-pyasn1_modules
-BuildRequires:	python3-pytest
+BuildRequires:	python3-pytest >= 3.6.0
+BuildRequires:	python3-pytz
+%endif
 %endif
+%if %{with doc}
+BuildRequires:	python3-sphinx_rtd_theme
+BuildRequires:	sphinx-pdg-3 >= 1.6.5
 %endif
-Requires:	python-cffi >= 1.4.1
-Requires:	python-six >= 1.4.1
+Requires:	openssl >= 1.0.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 cryptography is a package designed to expose cryptographic recipes and
 primitives to Python developers. Our goal is for it to be your
-"cryptographic standard library". It supports Python 2.6-2.7, Python
-3.2+, and PyPy.
+"cryptographic standard library". It supports Python 2.7, Python 3.4+,
+and PyPy.
 
 cryptography includes both high level recipes, and low level
 interfaces to common cryptographic algorithms such as symmetric
@@ -77,7 +81,7 @@ This package contains Python 2 modules.
 cryptography to pakiet zaprojektowany w celu udostępnienia funkcji i
 obiektów kryptograficznych programistom Pythona. Celem jest
 dostarczenie "standardowej biblioteki kryptograficznej". Obsługuje
-Pythona 2.6-2.7, Pythona 3.2+ oraz PyPy.
+Pythona 2.7, Pythona 3.4+ oraz PyPy.
 
 cryptography zawiera zarówno funkcje wysokopoziomowe, jak i
 niskopoziomowe interfejsy do popularnych algorytmów kryptograficznych,
@@ -90,17 +94,13 @@ Ten pakiet zawiera moduły Pythona 2.
 Summary:	Crypthography library for Python 3
 Summary(pl.UTF-8):	Biblioteka Cryptography dla Pythona 3
 Group:		Libraries/Python
-Requires:	python3-cffi >= 1.4.1
-%if "%{py3_ver}" < "3.4"
-BuildRequires:	python3-enum34
-%endif
-Requires:	python3-six >= 1.4.1
+Requires:	openssl >= 1.0.1
 
 %description -n python3-cryptography
 cryptography is a package designed to expose cryptographic recipes and
 primitives to Python developers. Our goal is for it to be your
-"cryptographic standard library". It supports Python 2.6-2.7, Python
-3.2+, and PyPy.
+"cryptographic standard library". It supports Python 2.7, Python 3.4+,
+and PyPy.
 
 cryptography includes both high level recipes, and low level
 interfaces to common cryptographic algorithms such as symmetric
@@ -112,7 +112,7 @@ This package contains Python 3 modules.
 cryptography to pakiet zaprojektowany w celu udostępnienia funkcji i
 obiektów kryptograficznych programistom Pythona. Celem jest
 dostarczenie "standardowej biblioteki kryptograficznej". Obsługuje
-Pythona 2.6-2.7, Pythona 3.2+ oraz PyPy.
+Pythona 2.7, Pythona 3.4+ oraz PyPy.
 
 cryptography zawiera zarówno funkcje wysokopoziomowe, jak i
 niskopoziomowe interfejsy do popularnych algorytmów kryptograficznych,
@@ -121,8 +121,26 @@ wyprowadzające klucze.
 
 Ten pakiet zawiera moduły Pythona 3.
 
+%package apidocs
+Summary:	API documentation for cryptography module
+Summary(pl.UTF-8):	Dokumentacja API modułu cryptography
+Group:		Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
+
+%description apidocs
+API documentation for cryptography module.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API modułu cryptography.
+
 %prep
-%setup -q -n cryptography-%{version}
+%setup -q -n cryptography-%{version} %{?with_tests:-a1}
+
+%if %{with tests}
+%{__mv} cryptography_vectors-%{version}/cryptography_vectors .
+%endif
 
 %build
 export CFLAGS="%{rpmcflags}"
@@ -131,10 +149,15 @@ export CFLAGS="%{rpmcflags}"
 %py_build %{?with_tests:test}
 %endif
 
-%if %{with python2}
+%if %{with python3}
 %py3_build %{?with_tests:test}
 %endif
 
+%if %{with doc}
+%{__make} -C docs html \
+	SPHINXBUILD=sphinx-build-3
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -161,19 +184,13 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitedir}/cryptography/hazmat/*.py[co]
 %dir %{py_sitedir}/cryptography/hazmat/backends
 %{py_sitedir}/cryptography/hazmat/backends/*.py[co]
-%dir %{py_sitedir}/cryptography/hazmat/backends/commoncrypto
-%{py_sitedir}/cryptography/hazmat/backends/commoncrypto/*.py[co]
 %dir %{py_sitedir}/cryptography/hazmat/backends/openssl
 %{py_sitedir}/cryptography/hazmat/backends/openssl/*.py[co]
 %dir %{py_sitedir}/cryptography/hazmat/bindings
 %{py_sitedir}/cryptography/hazmat/bindings/*.py[co]
 %attr(755,root,root) %{py_sitedir}/cryptography/hazmat/bindings/_*.so
-%dir %{py_sitedir}/cryptography/hazmat/bindings/commoncrypto
-%{py_sitedir}/cryptography/hazmat/bindings/commoncrypto/*.py[co]
 %dir %{py_sitedir}/cryptography/hazmat/bindings/openssl
 %{py_sitedir}/cryptography/hazmat/bindings/openssl/*.py[co]
-%dir %{py_sitedir}/cryptography/hazmat/primitives/interfaces
-%{py_sitedir}/cryptography/hazmat/primitives/interfaces/*.py[co]
 %dir %{py_sitedir}/cryptography/hazmat/primitives
 %{py_sitedir}/cryptography/hazmat/primitives/*.py[co]
 %dir %{py_sitedir}/cryptography/hazmat/primitives/asymmetric
@@ -182,6 +199,8 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitedir}/cryptography/hazmat/primitives/ciphers/*.py[co]
 %dir %{py_sitedir}/cryptography/hazmat/primitives/kdf
 %{py_sitedir}/cryptography/hazmat/primitives/kdf/*.py[co]
+%dir %{py_sitedir}/cryptography/hazmat/primitives/serialization
+%{py_sitedir}/cryptography/hazmat/primitives/serialization/*.py[co]
 %dir %{py_sitedir}/cryptography/hazmat/primitives/twofactor
 %{py_sitedir}/cryptography/hazmat/primitives/twofactor/*.py[co]
 %dir %{py_sitedir}/cryptography/x509
@@ -202,9 +221,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py3_sitedir}/cryptography/hazmat/backends
 %{py3_sitedir}/cryptography/hazmat/backends/*.py
 %{py3_sitedir}/cryptography/hazmat/backends/__pycache__
-%dir %{py3_sitedir}/cryptography/hazmat/backends/commoncrypto
-%{py3_sitedir}/cryptography/hazmat/backends/commoncrypto/*.py
-%{py3_sitedir}/cryptography/hazmat/backends/commoncrypto/__pycache__
 %dir %{py3_sitedir}/cryptography/hazmat/backends/openssl
 %{py3_sitedir}/cryptography/hazmat/backends/openssl/*.py
 %{py3_sitedir}/cryptography/hazmat/backends/openssl/__pycache__
@@ -212,15 +228,9 @@ rm -rf $RPM_BUILD_ROOT
 %{py3_sitedir}/cryptography/hazmat/bindings/*.py
 %{py3_sitedir}/cryptography/hazmat/bindings/__pycache__
 %attr(755,root,root) %{py3_sitedir}/cryptography/hazmat/bindings/_*.so
-%dir %{py3_sitedir}/cryptography/hazmat/bindings/commoncrypto
-%{py3_sitedir}/cryptography/hazmat/bindings/commoncrypto/*.py
-%{py3_sitedir}/cryptography/hazmat/bindings/commoncrypto/__pycache__
 %dir %{py3_sitedir}/cryptography/hazmat/bindings/openssl
 %{py3_sitedir}/cryptography/hazmat/bindings/openssl/*.py
 %{py3_sitedir}/cryptography/hazmat/bindings/openssl/__pycache__
-%dir %{py3_sitedir}/cryptography/hazmat/primitives/interfaces
-%{py3_sitedir}/cryptography/hazmat/primitives/interfaces/*.py
-%{py3_sitedir}/cryptography/hazmat/primitives/interfaces/__pycache__
 %dir %{py3_sitedir}/cryptography/hazmat/primitives
 %{py3_sitedir}/cryptography/hazmat/primitives/*.py
 %{py3_sitedir}/cryptography/hazmat/primitives/__pycache__
@@ -233,6 +243,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py3_sitedir}/cryptography/hazmat/primitives/kdf
 %{py3_sitedir}/cryptography/hazmat/primitives/kdf/*.py
 %{py3_sitedir}/cryptography/hazmat/primitives/kdf/__pycache__
+%dir %{py3_sitedir}/cryptography/hazmat/primitives/serialization
+%{py3_sitedir}/cryptography/hazmat/primitives/serialization/*.py
+%{py3_sitedir}/cryptography/hazmat/primitives/serialization/__pycache__
 %dir %{py3_sitedir}/cryptography/hazmat/primitives/twofactor
 %{py3_sitedir}/cryptography/hazmat/primitives/twofactor/*.py
 %{py3_sitedir}/cryptography/hazmat/primitives/twofactor/__pycache__
@@ -241,3 +254,9 @@ rm -rf $RPM_BUILD_ROOT
 %{py3_sitedir}/cryptography/x509/__pycache__
 %{py3_sitedir}/cryptography-%{version}-py*.egg-info
 %endif
+
+%if %{with doc}
+%files apidocs
+%defattr(644,root,root,755)
+%doc docs/_build/html/{_downloads,_modules,_static,development,hazmat,x509,*.html,*.js}
+%endif