Browse code
Fix pyOpenSSL error. (bug 1802217)
Change-Id: Ic1ffc0f7b140c8e665941880eebae2666ff92e6a
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2269
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Divya Thaluru <dthaluru@vmware.com>
xiaolin-vmware authored on 2017/04/05 04:44:22Showing 2 changed files
| ... | ... |
@@ -1,9 +1,9 @@ |
| 1 |
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
|
|
| 1 |
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
|
|
| 2 | 2 |
%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
|
| 3 | 3 |
|
| 4 | 4 |
Summary: Python cryptography library |
| 5 | 5 |
Name: python-cryptography |
| 6 |
-Version: 1.7.2 |
|
| 6 |
+Version: 1.8.1 |
|
| 7 | 7 |
Release: 1%{?dist}
|
| 8 | 8 |
Url: https://pypi.python.org/pypi/cryptography |
| 9 | 9 |
License: ASL 2.0 |
| ... | ... |
@@ -11,7 +11,7 @@ Group: Development/Languages/Python |
| 11 | 11 |
Vendor: VMware, Inc. |
| 12 | 12 |
Distribution: Photon |
| 13 | 13 |
Source0: https://pypi.io/packages/source/c/cryptography/cryptography-%{version}.tar.gz
|
| 14 |
-%define sha1 cryptography=2b5bc62fda71992633f83164b1a74c16a784acdf |
|
| 14 |
+%define sha1 cryptography=d15ffd42ca41260a61bc80cbeccf24e2dbf44253 |
|
| 15 | 15 |
BuildRequires: python2 |
| 16 | 16 |
BuildRequires: python2-libs |
| 17 | 17 |
BuildRequires: python2-devel |
| ... | ... |
@@ -23,6 +23,11 @@ Requires: python-cffi |
| 23 | 23 |
Requires: openssl |
| 24 | 24 |
Requires: python2 |
| 25 | 25 |
Requires: python2-libs |
| 26 |
+Requires: python-idna |
|
| 27 |
+Requires: python-pyasn1 |
|
| 28 |
+Requires: python-ipaddress |
|
| 29 |
+Requires: python-setuptools |
|
| 30 |
+Requires: python-packaging |
|
| 26 | 31 |
|
| 27 | 32 |
%description |
| 28 | 33 |
Cryptography is a Python library which exposes cryptographic recipes and primitives. |
| ... | ... |
@@ -37,6 +42,10 @@ BuildRequires: python3-cffi |
| 37 | 37 |
Requires: python3 |
| 38 | 38 |
Requires: python3-libs |
| 39 | 39 |
Requires: python3-cffi |
| 40 |
+Requires: python3-idna |
|
| 41 |
+Requires: python3-pyasn1 |
|
| 42 |
+Requires: python3-six |
|
| 43 |
+Requires: python3-packaging |
|
| 40 | 44 |
|
| 41 | 45 |
%description -n python3-cryptography |
| 42 | 46 |
|
| ... | ... |
@@ -44,14 +53,20 @@ Python 3 version. |
| 44 | 44 |
|
| 45 | 45 |
%prep |
| 46 | 46 |
%setup -q -n cryptography-%{version}
|
| 47 |
+rm -rf ../p3dir |
|
| 48 |
+cp -a . ../p3dir |
|
| 47 | 49 |
|
| 48 | 50 |
%build |
| 49 |
-python setup.py build |
|
| 51 |
+python2 setup.py build |
|
| 52 |
+pushd ../p3dir |
|
| 50 | 53 |
python3 setup.py build |
| 54 |
+popd |
|
| 51 | 55 |
|
| 52 | 56 |
%install |
| 53 |
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
|
|
| 57 |
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
|
|
| 58 |
+pushd ../p3dir |
|
| 54 | 59 |
python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
|
| 60 |
+popd |
|
| 55 | 61 |
|
| 56 | 62 |
%check |
| 57 | 63 |
openssl req \ |
| ... | ... |
@@ -65,18 +80,20 @@ openssl req \ |
| 65 | 65 |
-out photon.cert |
| 66 | 66 |
openssl rsa -in photon.key -out photon.pem |
| 67 | 67 |
mv photon.pem /etc/ssl/certs |
| 68 |
-python setup.py test |
|
| 68 |
+python2 setup.py test |
|
| 69 | 69 |
python3 setup.py test |
| 70 | 70 |
|
| 71 | 71 |
%files |
| 72 | 72 |
%defattr(-,root,root) |
| 73 |
-%{python_sitelib}/*
|
|
| 73 |
+%{python2_sitelib}/*
|
|
| 74 | 74 |
|
| 75 | 75 |
%files -n python3-cryptography |
| 76 | 76 |
%defattr(-,root,root,-) |
| 77 | 77 |
%{python3_sitelib}/*
|
| 78 | 78 |
|
| 79 | 79 |
%changelog |
| 80 |
+* Tue Apr 04 2017 Xiaolin Li <xiaolinl@vmware.com> 1.8.1-1 |
|
| 81 |
+- Updated to version 1.8.1. |
|
| 80 | 82 |
* Thu Feb 02 2017 Xiaolin Li <xiaolinl@vmware.com> 1.7.2-1 |
| 81 | 83 |
- Updated to version 1.7.2 and added python3 package. |
| 82 | 84 |
* Mon Oct 03 2016 ChangLee <changLee@vmware.com> 1.2.3-3 |
| 83 | 85 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,70 @@ |
| 0 |
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
|
|
| 1 |
+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
|
|
| 2 |
+ |
|
| 3 |
+Summary: Core utilities for Python packages |
|
| 4 |
+Name: python-packaging |
|
| 5 |
+Version: 16.8 |
|
| 6 |
+Release: 1%{?dist}
|
|
| 7 |
+Url: https://pypi.python.org/pypi/packaging |
|
| 8 |
+License: BSD or ASL 2.0 |
|
| 9 |
+Group: Development/Languages/Python |
|
| 10 |
+Vendor: VMware, Inc. |
|
| 11 |
+Distribution: Photon |
|
| 12 |
+Source0: pypi.python.org/packages/source/p/packaging/packaging-%{version}.tar.gz
|
|
| 13 |
+%define sha1 packaging=68f9574b50683c0962ad90346879e7a2319cc6d8 |
|
| 14 |
+BuildRequires: python2 |
|
| 15 |
+BuildRequires: python2-libs |
|
| 16 |
+BuildRequires: python2-devel |
|
| 17 |
+BuildRequires: python-setuptools |
|
| 18 |
+ |
|
| 19 |
+Requires: python2 |
|
| 20 |
+Requires: python2-libs |
|
| 21 |
+ |
|
| 22 |
+%description |
|
| 23 |
+Cryptography is a Python library which exposes cryptographic recipes and primitives. |
|
| 24 |
+ |
|
| 25 |
+%package -n python3-packaging |
|
| 26 |
+Summary: python-packaging |
|
| 27 |
+BuildRequires: python3 |
|
| 28 |
+BuildRequires: python3-devel |
|
| 29 |
+BuildRequires: python3-libs |
|
| 30 |
+ |
|
| 31 |
+Requires: python3 |
|
| 32 |
+Requires: python3-libs |
|
| 33 |
+ |
|
| 34 |
+%description -n python3-packaging |
|
| 35 |
+ |
|
| 36 |
+Python 3 version. |
|
| 37 |
+ |
|
| 38 |
+%prep |
|
| 39 |
+%setup -q -n packaging-%{version}
|
|
| 40 |
+rm -rf ../p3dir |
|
| 41 |
+cp -a . ../p3dir |
|
| 42 |
+ |
|
| 43 |
+%build |
|
| 44 |
+python2 setup.py build |
|
| 45 |
+pushd ../p3dir |
|
| 46 |
+python3 setup.py build |
|
| 47 |
+popd |
|
| 48 |
+ |
|
| 49 |
+%install |
|
| 50 |
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
|
|
| 51 |
+pushd ../p3dir |
|
| 52 |
+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
|
|
| 53 |
+popd |
|
| 54 |
+ |
|
| 55 |
+%check |
|
| 56 |
+python2 setup.py test |
|
| 57 |
+python3 setup.py test |
|
| 58 |
+ |
|
| 59 |
+%files |
|
| 60 |
+%defattr(-,root,root) |
|
| 61 |
+%{python2_sitelib}/*
|
|
| 62 |
+ |
|
| 63 |
+%files -n python3-packaging |
|
| 64 |
+%defattr(-,root,root,-) |
|
| 65 |
+%{python3_sitelib}/*
|
|
| 66 |
+ |
|
| 67 |
+%changelog |
|
| 68 |
+* Tue Apr 04 2017 Xiaolin Li <xiaolinl@vmware.com> 16.8-1 |
|
| 69 |
+- Initial packaging for Photon |