[packages/python-Numeric] modernize spec

glen glen at pld-linux.org
Mon Dec 30 09:19:37 CET 2013


commit 7ae20a0b4d3c07982b04cdbd39ecaced52198a30
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Dec 30 10:19:19 2013 +0200

    modernize spec

 python-Numeric.spec | 55 ++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 28 deletions(-)
---
diff --git a/python-Numeric.spec b/python-Numeric.spec
index 63b2c93..20274f9 100644
--- a/python-Numeric.spec
+++ b/python-Numeric.spec
@@ -1,5 +1,4 @@
 %define		module	Numeric
-
 Summary:	Python numerical facilities
 Summary(pl.UTF-8):	Moduły do obliczeń numerycznych dla języka Python
 Name:		python-%{module}
@@ -7,13 +6,13 @@ Version:	24.2
 Release:	9
 License:	distributable
 Group:		Libraries/Python
-Source0:	http://dl.sourceforge.net/numpy/%{module}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/numpy/%{module}-%{version}.tar.gz
 # Source0-md5:	2ae672656e06716a149acb048cca3093
 URL:		http://sourceforge.net/projects/numpy/
 BuildRequires:	python-devel >= 1:2.3
 BuildRequires:	python-modules
 BuildRequires:	rpm-pythonprov
-%pyrequires_eq	python-libs
+Requires:	python-libs
 Obsoletes:	python-numpy <= 0:24.2
 # dropped some time ago
 Obsoletes:	python-numpy-Properties
@@ -33,8 +32,8 @@ wielowymiarowych.
 Summary:	C header files for numerical modules
 Summary(pl.UTF-8):	Pliki nagłówkowe języka C modułów numerycznych
 Group:		Development/Languages/Python
-%pyrequires_eq	python-devel
 Requires:	%{name} = %{version}-%{release}
+Requires:	python-devel
 Obsoletes:	python-numpy-devel <= 0:24.2
 
 %description devel
@@ -47,8 +46,8 @@ Pliki nagłówkowe języka C modułów numerycznych.
 Summary:	Interface to the FFTPACK FORTRAN library
 Summary(pl.UTF-8):	Interfejs do biblioteki FFTPACK języka Fortran
 Group:		Libraries/Python
-%pyrequires_eq	python-libs
 Requires:	%{name} = %{version}-%{release}
+Requires:	python-libs
 Obsoletes:	python-numpy-FFT <= 0:24.2
 
 %description FFT
@@ -66,8 +65,8 @@ Fouriera na liczba rzeczywistych i zespolonych.
 Summary:	MA - a facility for dealing with masked arrays
 Summary(pl.UTF-8):	Moduł do obsługi macierzy niepełnych
 Group:		Libraries/Python
-%pyrequires_eq	python-libs
 Requires:	%{name} = %{version}-%{release}
+Requires:	python-libs
 Obsoletes:	python-numpy-MA <= 0:24.2
 
 %description MA
@@ -84,8 +83,8 @@ do operowania na tego typu macierzach.
 Summary:	Random Number Generator Object for NumPy
 Summary(pl.UTF-8):	Obiekt generatora liczb losowych dla modułu NumPy
 Group:		Libraries/Python
-%pyrequires_eq	python-libs
 Requires:	%{name} = %{version}-%{release}
+Requires:	python-libs
 Obsoletes:	python-numpy-RNG <= 0:24.2
 
 %description RNG
@@ -99,18 +98,18 @@ języka Python.
 %setup -q -n %{module}-%{version}
 
 %build
-CC="%{__cc}"; export CC
-CFLAGS="%{rpmcflags}"; export CFLAGS
-python setup.py build
+CC="%{__cc}" \
+CFLAGS="%{rpmcflags}" \
+%{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-python setup.py install \
+%{__python} setup.py install \
+	--skip-build \
+	--optimize=2 \
 	--root=$RPM_BUILD_ROOT
 
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
+%py_postclean
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -121,9 +120,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py_sitedir}/%{module}
 %attr(755,root,root) %{py_sitedir}/%{module}/*.so
 %dir %{py_sitedir}/%{module}/Numeric_headers
-%{py_sitedir}/%{module}/Numeric_headers/__init__.*
+%{py_sitedir}/%{module}/Numeric_headers/*.py[co]
 %{py_sitedir}/%{module}/*.py[co]
-%{py_sitedir}/%{module}/*.py
 
 %files devel
 %defattr(644,root,root,755)
@@ -134,28 +132,29 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py_sitedir}/%{module}/FFT
 %attr(755,root,root) %{py_sitedir}/%{module}/FFT/*.so
 %{py_sitedir}/%{module}/FFT/*.py[co]
-%{py_sitedir}/%{module}/FFT/*.py
 
-#%files kinds
-#%defattr(644,root,root,755)
-#%dir %{py_sitedir}/%{module}/kinds
-#%attr(755,root,root) %{py_sitedir}/%{module}/kinds/*.so
-#%{py_sitedir}/%{module}/kinds/*.py[co]
+%if 0
+%files kinds
+%defattr(644,root,root,755)
+%dir %{py_sitedir}/%{module}/kinds
+%attr(755,root,root) %{py_sitedir}/%{module}/kinds/*.so
+%{py_sitedir}/%{module}/kinds/*.py[co]
+%endif
 
 %files MA
 %defattr(644,root,root,755)
 %dir %{py_sitedir}/%{module}/MA
 %{py_sitedir}/%{module}/MA/*.py[co]
-%{py_sitedir}/%{module}/MA/*.py
 
-#%files Properties
-#%defattr(644,root,root,755)
-#%dir %{py_sitedir}/%{module}/PropertiedClasses
-#%{py_sitedir}/%{module}/PropertiedClasses/*.py[co]
+%if 0
+%files Properties
+%defattr(644,root,root,755)
+%dir %{py_sitedir}/%{module}/PropertiedClasses
+%{py_sitedir}/%{module}/PropertiedClasses/*.py[co]
+%endif
 
 %files RNG
 %defattr(644,root,root,755)
 %dir %{py_sitedir}/%{module}/RNG
 %attr(755,root,root) %{py_sitedir}/%{module}/RNG/*.so
 %{py_sitedir}/%{module}/RNG/*.py[co]
-%{py_sitedir}/%{module}/RNG/*.py
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-Numeric.git/commitdiff/7ae20a0b4d3c07982b04cdbd39ecaced52198a30



More information about the pld-cvs-commit mailing list