rpms/scalapack/devel .cvsignore, 1.2, 1.3 scalapack-1.7-64bitlibs.patch, 1.3, 1.4 scalapack-1.7-fedora.patch, 1.5, 1.6 scalapack.spec, 1.14, 1.15 sources, 1.2, 1.3

[Tom Callaway (spot)]

Author: spot

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

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

go to 1.7.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scalapack/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Apr 2005 17:46:32 -0000	1.2
+++ .cvsignore	15 Sep 2006 18:20:23 -0000	1.3
@@ -1 +1,2 @@
 scalapack.tgz
+scalapack-1.7.4.tgz

scalapack-1.7-64bitlibs.patch:

Index: scalapack-1.7-64bitlibs.patch
===================================================================
RCS file: /cvs/extras/rpms/scalapack/devel/scalapack-1.7-64bitlibs.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scalapack-1.7-64bitlibs.patch	9 Mar 2006 00:14:57 -0000	1.3
+++ scalapack-1.7-64bitlibs.patch	15 Sep 2006 18:20:23 -0000	1.4
@@ -1,6 +1,6 @@
---- scalapack-1.7/SCALAPACK/SLmake.inc.64bit	2006-03-08 18:10:40.000000000 -0600
-+++ scalapack-1.7/SCALAPACK/SLmake.inc	2006-03-08 18:11:04.000000000 -0600
-@@ -29,13 +29,13 @@
+--- 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 @@
  #  and the directory where the BLACS libraries are
  #
  BLACSDBGLVL   = 0
@@ -9,13 +9,6 @@
  #
  #  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

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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scalapack-1.7-fedora.patch	9 Mar 2006 00:14:57 -0000	1.5
+++ scalapack-1.7-fedora.patch	15 Sep 2006 18:20:23 -0000	1.6
@@ -1,5 +1,5 @@
---- scalapack-1.7/SCALAPACK/Makefile.fedora	2001-08-10 11:44:13.000000000 -0500
-+++ scalapack-1.7/SCALAPACK/Makefile	2006-03-08 18:08:21.000000000 -0600
+--- scalapack-1.7/scalapack-1.7.4/Makefile.fedora	2001-08-10 11:44:13.000000000 -0500
++++ scalapack-1.7/scalapack-1.7.4/Makefile	2006-03-08 18:08:21.000000000 -0600
 @@ -49,7 +49,7 @@
  all: lib
  #all: lib exe
@@ -16,14 +16,14 @@
 +
 +shared: scalapacklib
 +	( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; gcc -shared -o $(home)/libscalapack.so.1.0.0 *.o -Wl,-soname=libscalapack.so.1 ; cd .. )
---- scalapack-1.7/SCALAPACK/SLmake.inc.fedora	2001-08-08 21:59:50.000000000 -0500
-+++ scalapack-1.7/SCALAPACK/SLmake.inc	2006-03-08 18:09:05.000000000 -0600
+--- scalapack-1.7.4/scalapack-1.7.4/SLmake.inc.fedora	2001-08-08 21:59:50.000000000 -0500
++++ scalapack-1.7.4/scalapack-1.7.4/SLmake.inc	2006-03-08 18:09:05.000000000 -0600
 @@ -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
++home          = $(RPM_BUILD_DIR)/scalapack-1.7.4/scalapack-1.7.4
  #
  #  The platform identifier to suffix to the end of library names
  #


Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/devel/scalapack.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- scalapack.spec	9 Mar 2006 00:14:57 -0000	1.14
+++ scalapack.spec	15 Sep 2006 18:20:23 -0000	1.15
@@ -1,11 +1,11 @@
 Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers
 Name: scalapack
-Version: 1.7
-Release: 13%{?dist}
+Version: 1.7.4
+Release: 1%{?dist}
 License: Freely distributable
 Group: Development/Libraries
-URL: http://www.netlib.org/scalapack/scalapack_home.html
-Source0: http://www.netlib.org/scalapack/scalapack.tgz
+URL: http://www.netlib.org/lapack-dev/
+Source0: http://www.netlib.org/scalapack/scalapack-%{version}.tgz
 BuildRequires: lapack-devel, blas-devel, lam, blacs-devel
 BuildRequires: gcc-gfortran, glibc-devel
 Requires: lapack, blas-devel, lam, blacs-devel
@@ -55,7 +55,7 @@
 %endif
 
 %build
-cd SCALAPACK
+cd %{name}-%{version}
 make lib
 make exe
 
@@ -64,7 +64,7 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 
-cd SCALAPACK
+cd %{name}-%{version}
 cp -f INSTALL/scalapack_install.ps ../
 cp -f README ../
 cp -f libscalapack.a ${RPM_BUILD_ROOT}%{_libdir}
@@ -95,6 +95,9 @@
 %{_libdir}/libscalapack.so
 
 %changelog
+* Fri Sep 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.7.4-1
+- bump to 1.7.4
+
 * Wed Mar  8 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-13
 - lam moved into _libdir/lam... need to fix patches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scalapack/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Apr 2005 17:46:32 -0000	1.2
+++ sources	15 Sep 2006 18:20:23 -0000	1.3
@@ -1 +1 @@
-6d214940fab71d56117184d55cbb29f1  scalapack.tgz
+688b759059e11e54f5381bfa2850c519  scalapack-1.7.4.tgz