rpms/scalapack/FC-3 scalapack-1.7-64bitlibs.patch, 1.2, 1.3 scalapack-1.7-fedora3.patch, 1.3, 1.4 scalapack.spec, 1.10, 1.11

Thu Mar 9 00:14:34 UTC 2006

Author: spot

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

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

lam in Fedora Core moved its libs into %{_libdir}/lam, so we need to hokey pokey accordingly.


scalapack-1.7-64bitlibs.patch:

Index: scalapack-1.7-64bitlibs.patch
===================================================================
RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack-1.7-64bitlibs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- scalapack-1.7-64bitlibs.patch	1 Mar 2006 00:22:49 -0000	1.2
+++ scalapack-1.7-64bitlibs.patch	9 Mar 2006 00:14:32 -0000	1.3
@@ -1,6 +1,6 @@
---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD	2006-02-25 10:09:28.000000000 -0600
-+++ scalapack-1.7/SCALAPACK/SLmake.inc	2006-02-25 10:14:14.000000000 -0600
-@@ -29,7 +29,7 @@
+--- scalapack-1.7/SCALAPACK/SLmake.inc.64bit	2006-03-08 18:06:37.000000000 -0600
++++ scalapack-1.7/SCALAPACK/SLmake.inc	2006-03-08 18:07:19.000000000 -0600
+@@ -29,13 +29,13 @@
  #  and the directory where the BLACS libraries are
  #
  BLACSDBGLVL   = 0
@@ -9,3 +9,19 @@
  #
  #  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 -lmpi
++SMPLIB        = -L/usr/lib64 -lmpi
+ BLACSFINIT    = -lmpiblacsF77init
+ BLACSCINIT    = -lmpiblacsCinit
+ BLACSLIB      = -lmpiblacs
+@@ -97,7 +97,7 @@
+ SCALAPACKSLIB = -L$(home) -lscalapack
+ BLASLIB       = -lblas
+ #
+-LAMLIBS       = -L/usr/lib/lam -llam -lmpi -llamf77mpi
++LAMLIBS       = -L/usr/lib64/lam -llam -lmpi -llamf77mpi
+ EXTRALIBS     = -ldl -lpthread -lutil
+ PBLIBS        = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
+ PRLIBS        = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)

scalapack-1.7-fedora3.patch:

Index: scalapack-1.7-fedora3.patch
===================================================================
RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack-1.7-fedora3.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scalapack-1.7-fedora3.patch	8 Mar 2006 16:58:02 -0000	1.3
+++ scalapack-1.7-fedora3.patch	9 Mar 2006 00:14:32 -0000	1.4
@@ -1,5 +1,5 @@
---- scalapack-1.7/SCALAPACK/SLmake.inc.fedora3	2006-03-08 10:51:28.000000000 -0600
-+++ scalapack-1.7/SCALAPACK/SLmake.inc	2006-03-08 10:55:27.000000000 -0600
+--- scalapack-1.7/SCALAPACK/SLmake.inc.fedora3	2006-03-08 18:00:22.000000000 -0600
++++ scalapack-1.7/SCALAPACK/SLmake.inc	2006-03-08 18:04:06.000000000 -0600
 @@ -19,7 +19,7 @@
  #  The complete path to the top level of ScaLAPACK directory, usually
  #  $(HOME)/SCALAPACK
@@ -24,7 +24,7 @@
 -BLACSFINIT    = $(BLACSdir)/libmpiblacsF77init-p4.a
 -BLACSCINIT    = $(BLACSdir)/libmpiblacsCinit-p4.a
 -BLACSLIB      = $(BLACSdir)/libmpiblacs-p4.a
-+SMPLIB        = -lmpi
++SMPLIB        = -L/usr/lib -lmpi
 +BLACSFINIT    = -lmpiblacsF77init
 +BLACSCINIT    = -lmpiblacsCinit
 +BLACSLIB      = -lmpiblacs
@@ -44,7 +44,7 @@
  SRCFLAG       =
  F77LOADER     = $(F77)
  CCLOADER      = $(CC)
-@@ -94,9 +94,13 @@
+@@ -94,9 +94,12 @@
  #  The name of the libraries to be created/linked to
  #
  SCALAPACKLIB  = $(home)/libscalapack.a
@@ -55,15 +55,14 @@
 -PBLIBS        = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB)
 -PRLIBS        = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB)
 -RLIBS         = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB)
-+LAMLIBS       = -llam -lmpi -llamf77mpi
++LAMLIBS       = -L/usr/lib/lam -llam -lmpi -llamf77mpi
 +EXTRALIBS     = -ldl -lpthread -lutil
-+
 +PBLIBS        = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
 +PRLIBS        = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
 +RLIBS         = $(SCALAPACKSLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
  LIBS          = $(PBLIBS)
---- scalapack-1.7/SCALAPACK/Makefile.fedora3	2006-03-08 10:55:36.000000000 -0600
-+++ scalapack-1.7/SCALAPACK/Makefile	2006-03-08 10:56:39.000000000 -0600
+--- scalapack-1.7/SCALAPACK/Makefile.fedora3	2006-03-08 18:04:12.000000000 -0600
++++ scalapack-1.7/SCALAPACK/Makefile	2006-03-08 18:04:51.000000000 -0600
 @@ -49,7 +49,7 @@
  all: lib
  #all: lib exe


Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- scalapack.spec	8 Mar 2006 16:58:02 -0000	1.10
+++ scalapack.spec	9 Mar 2006 00:14:32 -0000	1.11
@@ -1,14 +1,14 @@
 Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers
 Name: scalapack
 Version: 1.7
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/scalapack/scalapack_home.html
 Source0: http://www.netlib.org/scalapack/scalapack.tgz
-BuildRequires: lapack-devel, blas-devel, lam, blacs-devel
+BuildRequires: lapack, blas, lam, blacs-devel
 BuildRequires: gcc-g77, glibc-devel
-Requires: lapack, blas-devel, lam, blacs-devel
+Requires: lapack, blas, lam, blacs-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: scalapack-1.7-fedora3.patch
 Patch1: scalapack-1.7-64bitlibs.patch
@@ -49,9 +49,9 @@
 
 %prep
 %setup -q -c -n %{name}-%{version}
-#%patch0 -p1
+%patch0 -p1
 %ifarch x86_64 ppc64 sparc64 ia64
-%patch1 -p1
+%patch1 -p1 -b .64bit
 %endif
 
 %build
@@ -95,6 +95,9 @@
 %{_libdir}/libscalapack.so
 
 %changelog
+* Wed Mar  8 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-13
+- lam moved into _libdir/lam... need to fix patches
+
 * Wed Mar  8 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-12
 - set -fPIC as NOOPT
 


