rpms/numpy/devel numpy-1.0-gfortran.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 numpy.spec, 1.6, 1.7 sources, 1.5, 1.6

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/numpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8550

Modified Files:
	.cvsignore numpy.spec sources 
Added Files:
	numpy-1.0-gfortran.patch 
Log Message:
update to numpy 1.0

numpy-1.0-gfortran.patch:

--- NEW FILE numpy-1.0-gfortran.patch ---
diff -ur numpy-1.0.orig/numpy/distutils/fcompiler/gnu.py numpy-1.0/numpy/distutils/fcompiler/gnu.py
--- numpy-1.0.orig/numpy/distutils/fcompiler/gnu.py	2006-10-09 03:46:59.000000000 -0400
+++ numpy-1.0/numpy/distutils/fcompiler/gnu.py	2006-10-25 13:51:18.000000000 -0400
@@ -30,7 +30,7 @@
         'compiler_f77' : [fc_exe, "-g", "-Wall","-fno-second-underscore"],
         'compiler_f90' : None, # Use --fcompiler=gnu95 for f90 codes
         'compiler_fix' : None,
-        'linker_so'    : [fc_exe, "-g", "-Wall"],
+        'linker_so'    : [fc_exe,"-shared", "-g", "-Wall"],
         'archiver'     : ["ar", "-cr"],
         'ranlib'       : ["ranlib"],
         'linker_exe'   : [fc_exe, "-g", "-Wall"]
@@ -255,7 +255,7 @@
         'compiler_f77' : [fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"],
         'compiler_f90' : [fc_exe,"-Wall","-fno-second-underscore"],
         'compiler_fix' : [fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"],
-        'linker_so'    : [fc_exe,"-Wall"],
+        'linker_so'    : [fc_exe,"-shared", "-Wall"],
         'archiver'     : ["ar", "-cr"],
         'ranlib'       : ["ranlib"],
         'linker_exe'   : [fc_exe,"-Wall"]


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/numpy/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Sep 2006 20:36:23 -0000	1.5
+++ .cvsignore	25 Oct 2006 21:55:43 -0000	1.6
@@ -1,2 +1,3 @@
 numpy-0.9.6.tar.gz
 numpy-0.9.8.tar.gz
+numpy-1.0.tar.gz


Index: numpy.spec
===================================================================
RCS file: /cvs/extras/rpms/numpy/devel/numpy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- numpy.spec	5 Sep 2006 20:36:23 -0000	1.6
+++ numpy.spec	25 Oct 2006 21:55:43 -0000	1.7
@@ -3,7 +3,7 @@
 %{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "2.3")}
 
 Name:           numpy
-Version:        0.9.8
+Version:        1.0
 Release:        1%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
@@ -12,8 +12,7 @@
 URL:            http://numeric.scipy.org/
 Source0:        http://dl.sourceforge.net/numpy/%{name}-%{version}.tar.gz
 Patch0:         numpy-0.9.4-f2pynumpy.patch
-Patch1:         numpy-0.9.8-gfortran.patch
-Patch2:         numpy-0.9.8-check_types.patch
+Patch1:         numpy-1.0-gfortran.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel atlas-devel blas-devel lapack-devel python-setuptools gcc-gfortran
@@ -34,7 +33,6 @@
 %setup -q
 %patch0 -p1 -b .f2pynumpy
 %patch1 -p1 -b .gfortran
-%patch2 -p1 -b .check_types
 
 %build
 ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
@@ -43,7 +41,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+#%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+# skip-build currently broken, this works around it for now
+ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
+    LAPACK=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" \
+    %{__python} setup.py install --root $RPM_BUILD_ROOT
 rm -rf docs-f2py ; mv $RPM_BUILD_ROOT%{python_sitearch}/%{name}/f2py/docs docs-f2py
 mv -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/f2py/f2py.1 f2py.1
 rm -rf doc ; mv -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/doc .
@@ -68,6 +70,9 @@
 %{python_sitearch}/%{name}
 
 %changelog
+* Wed Oct 25 2006 Jarod Wilson <jwilson at redhat.com> 1.0-1
+- New upstream release
+
 * Tue Sep 06 2006 Jarod Wilson <jwilson at redhat.com> 0.9.8-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/numpy/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Sep 2006 20:36:23 -0000	1.5
+++ sources	25 Oct 2006 21:55:43 -0000	1.6
@@ -1 +1 @@
-ca528d2b460a6567d70bb6bdf0dc1805  numpy-0.9.8.tar.gz
+47dd0daa82e7b3f0fe74b969b388d7b3  numpy-1.0.tar.gz