rpms/scalapack/devel scalapack-1.7-fedora.patch, 1.1, 1.2 scalapack.spec, 1.10, 1.11

[Tom Callaway (spot)]

Author: spot

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

Modified Files:
	scalapack-1.7-fedora.patch scalapack.spec 
Log Message:

Andrew Gormanly's fixes (devel only for now)


scalapack-1.7-fedora.patch:

Index: scalapack-1.7-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/scalapack/devel/scalapack-1.7-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scalapack-1.7-fedora.patch	24 Apr 2005 17:46:32 -0000	1.1
+++ scalapack-1.7-fedora.patch	14 Feb 2006 14:47:18 -0000	1.2
@@ -1,5 +1,14 @@
---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD	2005-04-18 16:22:41.000000000 -0500
-+++ scalapack-1.7/SCALAPACK/SLmake.inc	2005-04-18 16:34:42.000000000 -0500
+--- scalapack-1.7/SCALAPACK/SLmake.inc.BAD	2001-08-09 03:59:50.000000000 +0100
++++ scalapack-1.7/SCALAPACK/SLmake.inc	2006-02-10 13:05:56.000000000 +0000
+@@ -19,7 +19,7 @@
+ #  The complete path to the top level of ScaLAPACK directory, usually
+ #  $(HOME)/SCALAPACK
+ #
+-home          = $(HOME)/SCALAPACK
++home          = $(RPM_BUILD_DIR)/scalapack-1.7/SCALAPACK
+ #
+ #  The platform identifier to suffix to the end of library names
+ #
 @@ -29,16 +29,16 @@
  #  and the directory where the BLACS libraries are
  #
@@ -38,37 +47,27 @@
  SRCFLAG       =
  F77LOADER     = $(F77)
  CCLOADER      = $(CC)
-@@ -94,7 +94,7 @@
+@@ -82,7 +82,7 @@
+ #  C preprocessor defs for compilation 
+ #  (-DNoChange, -DAdd_, -DUpCase, or -Df77IsF2C)
+ #
+-CDEFS         = -Df77IsF2C -DNO_IEEE $(USEMPI)
++CDEFS         = -DAdd_ -DNO_IEEE $(USEMPI)
+ #
+ #  The archiver and the flag(s) to use when building archive (library)
+ #  Also the ranlib routine.  If your system has no ranlib, set RANLIB = echo
+@@ -94,9 +94,12 @@
  #  The name of the libraries to be created/linked to
  #
  SCALAPACKLIB  = $(home)/libscalapack.a
 -BLASLIB       = /usr/local/lib/libf77blas.a /usr/local/lib/libatlas.a
 +BLASLIB       = /usr/lib/libblas.a
  #
- PBLIBS        = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB)
- PRLIBS        = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB)
---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD	2005-04-18 16:59:45.000000000 -0500
-+++ scalapack-1.7/SCALAPACK/SLmake.inc	2005-04-18 16:59:59.000000000 -0500
-@@ -19,7 +19,7 @@
- #  The complete path to the top level of ScaLAPACK directory, usually
- #  $(HOME)/SCALAPACK
- #
--home          = $(HOME)/SCALAPACK
-+home          = $(RPM_BUILD_DIR)/scalapack-1.7/SCALAPACK
- #
- #  The platform identifier to suffix to the end of library names
- #
---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD	2005-04-18 17:17:04.000000000 -0500
-+++ scalapack-1.7/SCALAPACK/SLmake.inc	2005-04-18 17:20:06.000000000 -0500
-@@ -96,7 +96,10 @@
- SCALAPACKLIB  = $(home)/libscalapack.a
- BLASLIB       = /usr/lib/libblas.a
- #
 -PBLIBS        = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB)
 -PRLIBS        = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB)
 -RLIBS         = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB)
 +LAMLIBS       = /usr/lib/liblam.a /usr/lib/liblamf77mpi.a
-+EXTRALIBS     = -ldl -lpthread -llam -lmpi -llamf77mpi
++EXTRALIBS     = -ldl -lpthread -llam -lmpi -llamf77mpi -lutil
 +
 +PBLIBS        = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
 +PRLIBS        = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)


Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/devel/scalapack.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- scalapack.spec	9 Jan 2006 20:51:36 -0000	1.10
+++ scalapack.spec	14 Feb 2006 14:47:18 -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: 9%{?dist}
+Release: 10%{?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: gcc-gfortran
-Requires: lapack, blas, lam, blacs
+BuildRequires: gcc-gfortran, glibc-devel
+Requires: lapack, blas-devel, lam, blacs-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: scalapack-1.7-fedora.patch
 Patch1: scalapack-1.7-64bitlibs.patch
@@ -72,6 +72,9 @@
 %{_libdir}/libscalapack.a
 
 %changelog
+* Tue Feb 14 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-10
+- Incorporate Andrew Gormanly's fixes
+
 * Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-9
 - fix BR