1. photon
  2. Commit 429e8fec044bb62272017c77e30cbe92a8a8cbdc
Browse code

Fixed runtime dependencies in python pyOpenSSL and python service identity package And fixed make check errors in python service identity package

Change-Id: I4eca75686a8862c2b79d2d5a15b5d11aec836dc3
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3311
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George

dthaluru authored on 2017/07/22 07:50:15
Showing 2 changed files
SPECS/python-pyOpenSSL/python-pyOpenSSL.spec
History View file @ 429e8fe
... ... 
@@ -3,7 +3,7 @@
3 3 
 Summary:        Python wrapper module around the OpenSSL library
4 4 
 Name:           python-pyOpenSSL
5 5 
 Version:        16.2.0
6 
-Release:        4%{?dist}
6 
+Release:        5%{?dist}
7 7 
 Url:            https://github.com/pyca/pyopenssl
8 8 
 License:        ASL 2.0
9 9 
 Group:          Development/Languages/Python
... ... 
@@ -21,6 +21,7 @@ Requires:       python2-libs
21 21 
 Requires:       python-cryptography
22 22 
 Requires:       python-enum
23 23 
 Requires:       python-ipaddress
24 
+Requires:       python-six
24 25
25 26 
 BuildArch:      noarch
26 27
... ... 
@@ -37,6 +38,7 @@ BuildRequires:  python3-xml
37 37 
 Requires:       python3
38 38 
 Requires:       python3-libs
39 39 
 Requires:       python3-cryptography
40 
+Requires:       python3-six
40 41
41 42 
 %description -n python3-pyOpenSSL
42 43 
 Python 3 version.
... ... 
@@ -65,6 +67,8 @@ python3 setup.py test
65 65 
 %{python3_sitelib}/*
66 66
67 67 
 %changelog
68 
+*   Fri Jul 21 2017 Divya Thaluru <dthaluru@vmware.com> 16.2.0-5
69 
+-   Fixed runtime dependencies
68 70 
 *   Wed Jun 07 2017 Xiaolin Li <xiaolinl@vmware.com> 16.2.0-4
69 71 
 -   Add python3-setuptools and python3-xml to python3 sub package Buildrequires.
70 72 
 *   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 16.2.0-3
SPECS/python-service_identity/python-service_identity.spec
History View file @ 429e8fe
... ... 
@@ -4,7 +4,7 @@
4 4 
 Summary:        Service identity verification for pyOpenSSL.
5 5 
 Name:           python-service_identity
6 6 
 Version:        16.0.0
7 
-Release:        2%{?dist}
7 
+Release:        3%{?dist}
8 8 
 License:        MIT
9 9 
 Group:          Development/Languages/Python
10 10 
 Vendor:         VMware, Inc.
... ... 
@@ -18,9 +18,21 @@ BuildRequires:  python2-libs
18 18 
 BuildRequires:  python2-devel
19 19 
 BuildRequires:  python-setuptools
20 20 
 BuildRequires:  python-incremental
21 
+%if %{with_check}
22 
+BuildRequires:	python-pytest
23 
+BuildRequires:	python-pyasn1-modules
24 
+BuildRequires:	python-pyasn1
25 
+BuildRequires:	python-attrs
26 
+BuildRequires:	python-pyOpenSSL
27 
+BuildRequires:	python-idna
28 
+%endif
21 29
22 30 
 Requires:       python2
23 31 
 Requires:       python2-libs
32 
+Requires:       python-pyasn1-modules
33 
+Requires:       python-pyasn1
34 
+Requires:       python-attrs
35 
+Requires:       python-pyOpenSSL
24 36
25 37 
 BuildArch:      noarch
26 38
... ... 
@@ -35,9 +47,21 @@ BuildRequires:  python3-devel
35 35 
 BuildRequires:  python3-libs
36 36 
 BuildRequires:  python3-setuptools
37 37 
 BuildRequires:  python3-xml
38 
+%if %{with_check}
39 
+BuildRequires:	python3-pytest
40 
+BuildRequires:	python3-pyasn1-modules
41 
+BuildRequires:	python3-pyasn1
42 
+BuildRequires:	python3-attrs
43 
+BuildRequires:	python3-pyOpenSSL
44 
+BuildRequires:	python3-idna
45 
+%endif
38 46
39 47 
 Requires:       python3
40 48 
 Requires:       python3-libs
49 
+Requires:       python3-pyasn1-modules
50 
+Requires:       python3-pyasn1
51 
+Requires:       python3-attrs
52 
+Requires:       python3-pyOpenSSL
41 53 
 %description -n python3-service_identity
42 54 
 Python 3 version.
43 55
... ... 
@@ -53,8 +77,8 @@ python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
53 53 
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
54 54
55 55 
 %check
56 
-python2 setup.py test
57 
-python3 setup.py test
56 
+PYTHONPATH="%{buildroot}%{python2_sitelib}" py.test2
57 
+PYTHONPATH="%{buildroot}%{python3_sitelib}" py.test3
58 58
59 59 
 %files
60 60 
 %defattr(-,root,root)
... ... 
@@ -65,7 +89,10 @@ python3 setup.py test
65 65 
 %{python3_sitelib}/*
66 66
67 67 
 %changelog
68 
+*   Fri Jul 21 2017 Divya Thaluru <dthaluru@vmware.com> 16.0.0-3
69 
+-   Fixed runtime dependencies
70 
+-   Fixed make check errors
68 71 
 *   Wed Jun 07 2017 Xiaolin Li <xiaolinl@vmware.com> 16.0.0-2
69 72 
 -   Add python3-setuptools and python3-xml to python3 sub package Buildrequires.
70 73 
 *   Mon Mar 06 2017 Xiaolin Li <xiaolinl@vmware.com> 16.0.0-1
71 
--   Initial packaging for Photon.
72 74 
\ No newline at end of file
75 
+-   Initial packaging for Photon.