[packages/python-pycoin] simplify, unify

glen glen at pld-linux.org
Sun Feb 2 13:42:23 CET 2014


commit c3ae2eb5f70cb3ee396f54441f1e1be2422396d6
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Feb 2 14:42:20 2014 +0200

    simplify, unify

 python-pycoin.spec | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/python-pycoin.spec b/python-pycoin.spec
index bf1d106..f7a3dd7 100644
--- a/python-pycoin.spec
+++ b/python-pycoin.spec
@@ -2,9 +2,8 @@
 # Conditional build:
 %bcond_without	python2		# Python 2.x module
 %bcond_without	python3		# Python 3.x module
-#
-%define	module	pycoin
-#
+
+%define 	module	pycoin
 Summary:	Bitcoin utility library
 Name:		python-pycoin
 Version:	0.24
@@ -14,17 +13,17 @@ Group:		Development/Languages/Python
 Source0:	https://github.com/richardkiss/pycoin/archive/%{version}.tar.gz
 # Source0-md5:	512f17827323eb1ba2bfe7952829575d
 URL:		https://github.com/richardkiss/pycoin
+BuildRequires:	rpm-pythonprov
 %if %{with python2}
 BuildRequires:	python-devel
 BuildRequires:	python-modules
-Requires:	python
 %endif
 %if %{with python3}
 BuildRequires:	python3-2to3
 BuildRequires:	python3-devel
 BuildRequires:	python3-modules
 %endif
-BuildRequires:	rpm-pythonprov
+Requires:	python
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -56,17 +55,17 @@ Tools that use %{module} library.
 
 %build
 %if %{with python2}
-%{__python} ./setup.py build --build-base py2
+%{__python} setup.py build --build-base py2
 %endif
 %if %{with python3}
-%{__python3} ./setup.py build --build-base py3
+%{__python3} setup.py build --build-base py3
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %if %{with python2}
 install -d $RPM_BUILD_ROOT%{_examplesdir}/python-%{module}-%{version}
-%{__python} ./setup.py build \
+%{__python} setup.py build \
 	--build-base py2 \
 	install \
 	--optimize 2 \
@@ -75,7 +74,7 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/python-%{module}-%{version}
 
 %if %{with python3}
 install -d $RPM_BUILD_ROOT%{_examplesdir}/python3-%{module}-%{version}
-%{__python3} ./setup.py build \
+%{__python3} setup.py build \
 	--build-base py3 \
 	install \
 	--optimize 2 \
@@ -89,18 +88,18 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc CHANGES CREDITS README.md
-%{_examplesdir}/python-%{module}-%{version}
 %{py_sitescriptdir}/%{module}
 %{py_sitescriptdir}/*egg-info
+%{_examplesdir}/python-%{module}-%{version}
 %endif
 
 %if %{with python3}
 %files -n python3-%{module}
 %defattr(644,root,root,755)
 %doc CHANGES CREDITS README.md
-%{_examplesdir}/python3-%{module}-%{version}
 %{py3_sitescriptdir}/%{module}
 %{py3_sitescriptdir}/*egg-info
+%{_examplesdir}/python3-%{module}-%{version}
 %endif
 
 %files -n %{module}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-pycoin.git/commitdiff/c3ae2eb5f70cb3ee396f54441f1e1be2422396d6



More information about the pld-cvs-commit mailing list