[packages/python-serial] simplify, unify

glen glen at pld-linux.org
Sun Feb 2 13:46:17 CET 2014


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

    simplify, unify

 python-serial.spec | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)
---
diff --git a/python-serial.spec b/python-serial.spec
index 0774cbf..ab4e96f 100644
--- a/python-serial.spec
+++ b/python-serial.spec
@@ -2,9 +2,8 @@
 # Conditional build:
 %bcond_without	python2		# Python 2.x module
 %bcond_without	python3		# Python 3.x module
-#
-%define	module	serial
-#
+
+%define 	module	serial
 Summary:	Serial port interface module
 Summary(pl.UTF-8):	Moduł interfejsu do portu szeregowego
 Name:		python-serial
@@ -15,18 +14,18 @@ Group:		Development/Languages/Python
 Source0:	http://pypi.python.org/packages/source/p/pyserial/pyserial-%{version}.tar.gz
 # Source0-md5:	794506184df83ef2290de0d18803dd11
 URL:		http://pyserial.wiki.sourceforge.net/pySerial
+BuildRequires:	rpm-pythonprov
+BuildRequires:	unzip
 %if %{with python2}
 BuildRequires:	python-devel
 BuildRequires:	python-modules
-%pyrequires_eq	python
+Requires:	python
 %endif
 %if %{with python3}
+BuildRequires:	python3-2to3
 BuildRequires:	python3-devel
 BuildRequires:	python3-modules
-BuildRequires:	python3-2to3
 %endif
-BuildRequires:	rpm-pythonprov
-BuildRequires:	unzip
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -44,10 +43,8 @@ automatycznie wybiera właściwy backend.
 
 %package -n	python3-%{module}
 Summary:	Serial port interface module
-Version:	%{version}
-Release:	%{release}
 Group:		Libraries/Python
-%pyrequires_eq	python3
+Requires:	python3
 
 %description -n python3-%{module}
 This module encapsulates the access for the serial port. It provides
@@ -55,10 +52,8 @@ backends for Python running on Windows, Linux, BSD (possibly any POSIX
 compilant system) and Jython. The module named "serial" automatically
 selects the appropriate backend.
 
-%package -n	miniterm
+%package -n miniterm
 Summary:	Very simple serial terminal
-Version:	%{version}
-Release:	%{release}
 Group:		Applications/Communications
 Requires:	python%{?with_python3:3}-%{module} = %{version}-%{release}
 
@@ -70,33 +65,33 @@ Very simple serial terminal written in Python.
 
 %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 \
 	--root=$RPM_BUILD_ROOT
-cp examples/*.py $RPM_BUILD_ROOT%{_examplesdir}/python-%{module}-%{version}
+cp -p examples/*.py $RPM_BUILD_ROOT%{_examplesdir}/python-%{module}-%{version}
 find $RPM_BUILD_ROOT%{py_sitescriptdir} -name "*serialjava*" -exec rm {} \;
 find $RPM_BUILD_ROOT%{py_sitescriptdir} -name "*serialwin*" -exec rm {} \;
 %endif
 %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 \
 	--root=$RPM_BUILD_ROOT
-cp examples/*.py $RPM_BUILD_ROOT%{_examplesdir}/python3-%{module}-%{version}
+cp -p examples/*.py $RPM_BUILD_ROOT%{_examplesdir}/python3-%{module}-%{version}
 find $RPM_BUILD_ROOT%{py3_sitescriptdir} -name "*serialjava*" -exec rm {} \;
 find $RPM_BUILD_ROOT%{py3_sitescriptdir} -name "*serialwin*" -exec rm {} \;
 %endif
@@ -108,18 +103,18 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc CHANGES.txt LICENSE.txt README.txt
-%{_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.txt LICENSE.txt README.txt
-%{_examplesdir}/python3-%{module}-%{version}
 %{py3_sitescriptdir}/%{module}
 %{py3_sitescriptdir}/*egg-info
+%{_examplesdir}/python3-%{module}-%{version}
 %endif
 
 %files -n miniterm
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-serial.git/commitdiff/d0f6a6f1a2a31ea89a7948735d5756602050a121



More information about the pld-cvs-commit mailing list