rpms/scalapack/FC-5 scalapack-1.7-64bitlibs.patch, 1.4, 1.5 scalapack.spec, 1.15, 1.16

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/scalapack/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15304/FC-5

Modified Files:
	scalapack-1.7-64bitlibs.patch scalapack.spec 
Log Message:

Fix 64bit patch


scalapack-1.7-64bitlibs.patch:

Index: scalapack-1.7-64bitlibs.patch
===================================================================
RCS file: /cvs/extras/rpms/scalapack/FC-5/scalapack-1.7-64bitlibs.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scalapack-1.7-64bitlibs.patch	15 Sep 2006 18:20:22 -0000	1.4
+++ scalapack-1.7-64bitlibs.patch	15 Sep 2006 18:42:22 -0000	1.5
@@ -1,6 +1,6 @@
---- scalapack-1.7.4/scalapack-1.7.4/SLmake.inc.64bit	2006-03-08 17:50:59.000000000 -0600
-+++ scalapack-1.7.4/scalapack-1.7.4/SLmake.inc	2006-03-08 17:51:18.000000000 -0600
-@@ -29,7 +29,7 @@
+--- scalapack-1.7.4/scalapack-1.7.4/SLmake.inc.64	2006-09-15 13:39:22.000000000 -0500
++++ scalapack-1.7.4/scalapack-1.7.4/SLmake.inc	2006-09-15 13:39:53.000000000 -0500
+@@ -29,13 +29,13 @@
  #  and the directory where the BLACS libraries are
  #
  BLACSDBGLVL   = 0
@@ -9,6 +9,13 @@
  #
  #  MPI setup; tailor to your system if using MPIBLACS
  #  Will need to comment out these 6 lines if using PVM
+ #
+ USEMPI        = -DUsingMpiBlacs
+-SMPLIB        = -L/usr/lib/lam -lmpi
++SMPLIB        = -L/usr/lib64/lam -lmpi
+ BLACSFINIT    = -lmpiblacsF77init
+ BLACSCINIT    = -lmpiblacsCinit
+ BLACSLIB      = -lmpiblacs
 @@ -97,7 +97,7 @@
  SCALAPACKSLIB = -L$(home) -lscalapack
  BLASLIB       = -lblas


Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/FC-5/scalapack.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- scalapack.spec	15 Sep 2006 18:20:22 -0000	1.15
+++ scalapack.spec	15 Sep 2006 18:42:22 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers
 Name: scalapack
 Version: 1.7.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/lapack-dev/
@@ -51,7 +51,7 @@
 %setup -q -c -n %{name}-%{version}
 %patch0 -p1
 %ifarch x86_64 ppc64 sparc64 ia64
-%patch1 -p1
+%patch1 -p1 -b .64
 %endif
 
 %build
@@ -95,6 +95,9 @@
 %{_libdir}/libscalapack.so
 
 %changelog
+* Fri Sep 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.7.4-2
+- fix 64bit patch
+
 * Fri Sep 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.7.4-1
 - bump to 1.7.4