[packages/python-ipaddr] - rel 2; build/install via setup.py (thus avoid installing setup.py which was causing: sphinx-build:

arekm arekm at pld-linux.org
Sun Oct 19 21:27:39 CEST 2014


commit a3bcb4f730f75478fca7e9f69b14d0cab145d015
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Oct 19 21:27:36 2014 +0200

    - rel 2; build/install via setup.py (thus avoid installing setup.py which was causing: sphinx-build: error: option -b not recognized)

 python-ipaddr.spec | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/python-ipaddr.spec b/python-ipaddr.spec
index e4d3a95..884a440 100644
--- a/python-ipaddr.spec
+++ b/python-ipaddr.spec
@@ -5,7 +5,7 @@ Summary:	Python module is useful to manipulate IP addresses (sets)
 Summary(pl.UTF-8):	Moduł języka Python do manipulacji adresami IP
 Name:		python-%{module}
 Version:	2.1.10
-Release:	1
+Release:	2
 License:	Apache v2.0
 Group:		Libraries/Python
 Source0:	http://ipaddr-py.googlecode.com/files/%{module}-%{version}.tar.gz
@@ -14,7 +14,7 @@ URL:		http://code.google.com/p/ipaddr-py/
 BuildRequires:	python
 BuildRequires:	python-modules
 BuildRequires:	rpm-pythonprov
-%pyrequires_eq 	python-modules
+Requires:	python-modules
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -28,13 +28,17 @@ Moduł języka Python do manipulacji adresami IP.
 %prep
 %setup -q -n %{module}-%{version}
 
+%build
+%{__python} setup.py build --build-base build-2
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{py_sitescriptdir}
-install *.py $RPM_BUILD_ROOT%{py_sitescriptdir}
+%{__python} setup.py \
+	build --build-base build-2 \
+	install --skip-build \
+	--optimize=2 \
+	--root=$RPM_BUILD_ROOT
 
-%py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
 %py_postclean
 
 %clean
@@ -43,3 +47,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %{py_sitescriptdir}/*.py[co]
+%if "%{py_ver}" > "2.4"
+%{py_sitescriptdir}/%{module}-%{version}-py*.egg-info
+%endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-ipaddr.git/commitdiff/a3bcb4f730f75478fca7e9f69b14d0cab145d015



More information about the pld-cvs-commit mailing list