commit b4dcbe074bec6ecfb45d7e014d5e0bb8378e2def
Author: Jacek Konieczny <[email protected]>
Date: Thu Dec 3 18:02:05 2015 +0100
fix py_build/py_install usage
python-requests.spec | 24 +++++++-----------------
1 file changed, 7 insertions(+), 17 deletions(-)
---
diff --git a/python-requests.spec b/python-requests.spec
index 438c3e2..452608c 100644
--- a/python-requests.spec
+++ b/python-requests.spec
@@ -40,7 +40,7 @@ BuildRequires: python3-urllib3 >= %{urllib3ver}
%{?with_tests:BuildRequires: python3-pytest >= 2.3.4}
%endif
BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.710
+BuildRequires: rpmbuild(macros) >= 1.713
Requires: ca-certificates
Requires: python-modules >= 1:2.6
%if %{without bundled}
@@ -118,37 +118,27 @@ Ten pakiet zawiera moduĊ dla Pythona 3.x.
%build
%if %{with python2}
-%py_build -b py2 %{?with_tests:test}
-%{?with_tests:cp requirements.txt test_requests.py py2; cd py2;
PYTHONPATH=$(pwd)/lib %{__python} test_requests.py; cd ..}
+%py_build %{?with_tests:test}
+%{?with_tests:cp requirements.txt test_requests.py build-2; cd build-2;
PYTHONPATH=$(pwd)/lib %{__python} test_requests.py; cd ..}
%endif
%if %{with python3}
-%py3_build -b py3 %{?with_tests:test}
-%{?with_tests:cp requirements.txt test_requests.py py3; cd py3;
PYTHONPATH=$(pwd)/lib %{__python3} test_requests.py; cd ..}
+%py3_build %{?with_tests:test}
+%{?with_tests:cp requirements.txt test_requests.py build-3; cd build-3;
PYTHONPATH=$(pwd)/lib %{__python3} test_requests.py; cd ..}
%endif
%install
rm -rf $RPM_BUILD_ROOT
%if %{with python2}
-%{__python} setup.py \
- build -b py2 \
- install \
- --skip-build \
- --optimize=2 \
- --root=$RPM_BUILD_ROOT
+%py_install
%py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
%py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
%py_postclean
%endif
%if %{with python3}
-%{__python3} setup.py \
- build -b py3 \
- install \
- --skip-build \
- --optimize=2 \
- --root=$RPM_BUILD_ROOT
+%py3_install
%endif
%{__rm}
$RPM_BUILD_ROOT{%{py_sitescriptdir},%{py3_sitescriptdir}}/%{module}/cacert.pem
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-requests.git/commitdiff/b4dcbe074bec6ecfb45d7e014d5e0bb8378e2def
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
