[packages/python-pyOpenSSL] up to 0.15, use new macros fully

glen glen at pld-linux.org
Fri Dec 4 13:17:25 CET 2015


commit 81847f42530d19b055769807144af98cd63f9b93
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Dec 4 14:15:22 2015 +0200

    up to 0.15, use new macros fully

 python-pyOpenSSL.spec | 41 +++++++++++++++--------------------------
 1 file changed, 15 insertions(+), 26 deletions(-)
---
diff --git a/python-pyOpenSSL.spec b/python-pyOpenSSL.spec
index 249b99f..17aeb6f 100644
--- a/python-pyOpenSSL.spec
+++ b/python-pyOpenSSL.spec
@@ -3,27 +3,29 @@
 %bcond_without	python2	# CPython 2.x module
 %bcond_without	python3	# CPython 3.x module
 %bcond_without	doc	# HTML documentation (sphinx-based)
-#
+
 %define		module	pyOpenSSL
 Summary:	Python 2 interface to the OpenSSL library
 Summary(pl.UTF-8):	Interfejs Pythona 2 do biblioteki OpenSSL
 Name:		python-%{module}
-Version:	0.14
-Release:	5
+Version:	0.15
+Release:	1
 License:	Apache v2.0
 Group:		Libraries/Python
 Source0:	https://pypi.python.org/packages/source/p/pyOpenSSL/%{module}-%{version}.tar.gz
-# Source0-md5:	8579ff3a1d858858acfba5f046a4ddf7
+# Source0-md5:	661ddf97b75320d6004a56160a4a8578
 URL:		https://github.com/pyca/pyopenssl
+BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.710
 %if %{with python2}
 BuildRequires:	python-modules >= 1:2.6
 %endif
 %if %{with python3}
 BuildRequires:	python3-modules >= 3.2
 %endif
-BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.710
-%{?with_doc:BuildRequires:	sphinx-pdg}
+%if %{with doc}
+BuildRequires:	sphinx-pdg
+%endif
 Requires:	python-cryptography >= 0.2.1
 Requires:	python-six >= 1.5.2
 Obsoletes:	python-OpenSSL
@@ -97,12 +99,10 @@ Pakiet zawierający przykładowe skrypty dla modułu Pythona pyOpenSSL.
 
 %build
 %if %{with python2}
-%py_build \
-	--build-base build-2
+%py_build
 %endif
 %if %{with python3}
-%py3_build \
-	--build-base build-3
+%py3_build
 %endif
 
 %if %{with doc}
@@ -114,23 +114,12 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %if %{with python2}
-%{__python} setup.py \
-	build \
-		--build-base build-2 \
-	install \
-		--optimize=2 \
-		--root=$RPM_BUILD_ROOT
-
+%py_install
 %py_postclean
 %endif
 
 %if %{with python3}
-%{__python3} setup.py \
-	build \
-		--build-base build-3 \
-	install \
-		--optimize=2 \
-		--root=$RPM_BUILD_ROOT
+%py3_install
 %endif
 
 cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -141,7 +130,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python2}
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog README TODO %{?with_doc:doc/_build/html/{*.html,_static,api}}
+%doc ChangeLog README.rst TODO %{?with_doc:doc/_build/html/{*.html,_static,api}}
 %dir %{py_sitescriptdir}/OpenSSL
 %{py_sitescriptdir}/OpenSSL/*.py[co]
 %dir %{py_sitescriptdir}/OpenSSL/test
@@ -152,7 +141,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python3}
 %files -n python3-pyOpenSSL
 %defattr(644,root,root,755)
-%doc ChangeLog README TODO %{?with_doc:doc/_build/html/{*.html,_static,api}}
+%doc ChangeLog README.rst TODO %{?with_doc:doc/_build/html/{*.html,_static,api}}
 %dir %{py3_sitescriptdir}/OpenSSL
 %{py3_sitescriptdir}/OpenSSL/*.py
 %{py3_sitescriptdir}/OpenSSL/__pycache__
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-pyOpenSSL.git/commitdiff/0508ae5bc0c5a1dea3007b13dafe097f7f3f181a



More information about the pld-cvs-commit mailing list