diff --git a/python-crypto/python-crypto.spec b/python-crypto/python-crypto.spec index 2bb4d1be32..4fc05c8f45 100644 --- a/python-crypto/python-crypto.spec +++ b/python-crypto/python-crypto.spec @@ -22,11 +22,12 @@ ## # package versions -%define V_python 2.7 -%define V_pycrypto 2.6.1 -%define V_pyopenssl 0.15.1 -%define V_cryptography 1.1.1 -%define V_pyasn1 0.1.9 +%define V_python 2.7 +%define V_pycrypto 2.6.1 +%define V_pyopenssl 0.15.1 +%define V_cryptography 1.1.1 +%define V_pyasn1 0.1.9 +%define V_ndg_httpsclient 0.4.0 # package information Name: python-crypto @@ -46,6 +47,7 @@ Source0: https://pypi.python.org/packages/source/p/pycrypto/pycrypto-%{V_py Source1: https://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-%{V_pyopenssl}.tar.gz Source2: https://pypi.python.org/packages/source/c/cryptography/cryptography-%{V_cryptography}.tar.gz Source3: https://pypi.python.org/packages/source/p/pyasn1/pyasn1-%{V_pyasn1}.tar.gz +Source4: https://pypi.python.org/packages/source/n/ndg-httpsclient/ndg_httpsclient-%{V_ndg_httpsclient}.tar.gz # build information BuildPreReq: OpenPKG, openpkg >= 20140101, python >= %{V_python} @@ -77,12 +79,18 @@ PreReq: openssl, gmp, python-sys, python-parse url = https://pypi.python.org/pypi/pyasn1/ regex = pyasn1-(__VER__)\.tar\.gz } + prog python-crypto:ndg-httpsclient = { + version = %{V_ndg_httpsclient} + url = https://pypi.python.org/pypi/ndg-httpsclient/ + regex = ndg_httpsclient-(__VER__)\.tar\.gz + } %prep %setup -q -c %setup -q -T -D -a 1 %setup -q -T -D -a 2 %setup -q -T -D -a 3 + %setup -q -T -D -a 4 %build @@ -117,8 +125,11 @@ PreReq: openssl, gmp, python-sys, python-parse ) || exit $? ( cd pyasn1-%{V_pyasn1} PYTHONPATH=$RPM_BUILD_ROOT%{l_prefix}/lib/python/site-packages \ - %{l_prefix}/bin/python setup.py build_ext \ - %{l_cppflags openssl .} %{l_ldflags} + %{l_prefix}/bin/python setup.py install \ + --root=$RPM_BUILD_ROOT \ + --prefix=%{l_prefix} + ) || exit $? + ( cd ndg_httpsclient-%{V_ndg_httpsclient} PYTHONPATH=$RPM_BUILD_ROOT%{l_prefix}/lib/python/site-packages \ %{l_prefix}/bin/python setup.py install \ --root=$RPM_BUILD_ROOT \