rpms/R-RScaLAPACK/devel R-RScaLAPACK-0.5.1-mpi-blacs.patch, NONE, 1.1 R-RScaLAPACK.spec, 1.28, 1.29

[Tom Callaway]

Author: spot

Update of /cvs/extras/rpms/R-RScaLAPACK/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15090

Modified Files:
	R-RScaLAPACK.spec 
Added Files:
	R-RScaLAPACK-0.5.1-mpi-blacs.patch 
Log Message:
apply a lot more duct tape

R-RScaLAPACK-0.5.1-mpi-blacs.patch:

--- NEW FILE R-RScaLAPACK-0.5.1-mpi-blacs.patch ---
diff -up RScaLAPACK/RScaLAPACK/configure.orig RScaLAPACK/RScaLAPACK/configure
--- RScaLAPACK/RScaLAPACK/configure.orig	2005-09-02 10:11:12.000000000 -0400
+++ RScaLAPACK/RScaLAPACK/configure	2008-09-24 14:39:47.000000000 -0400
@@ -3682,13 +3682,13 @@ echo "$as_me: error: libcblacsF77init.a 
 	fi
 else
 
-echo "$as_me:$LINENO: checking for Cblacs_gridexit in -lblacs" >&5
-echo $ECHO_N "checking for Cblacs_gridexit in -lblacs... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for Cblacs_gridexit in -lmpiblacs" >&5
+echo $ECHO_N "checking for Cblacs_gridexit in -lmpiblacs... $ECHO_C" >&6
 if test "${ac_cv_lib_blacs_Cblacs_gridexit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lblacs  $LIBS"
+LIBS="-lmpiblacs  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3751,7 +3751,7 @@ if test $ac_cv_lib_blacs_Cblacs_gridexit
 #define HAVE_LIBBLACS 1
 _ACEOF
 
-  LIBS="-lblacs $LIBS"
+  LIBS="-lmpiblacs $LIBS"
 
 else
 
@@ -3763,13 +3763,13 @@ fi
 
 
 
-echo "$as_me:$LINENO: checking for Cblacs_pinfo in -lblacsCinit" >&5
-echo $ECHO_N "checking for Cblacs_pinfo in -lblacsCinit... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for Cblacs_pinfo in -lmpiblacsCinit" >&5
+echo $ECHO_N "checking for Cblacs_pinfo in -lmpiblacsCinit... $ECHO_C" >&6
 if test "${ac_cv_lib_blacsCinit_Cblacs_pinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lblacsCinit  $LIBS"
+LIBS="-lmpiblacsCinit  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3832,7 +3832,7 @@ if test $ac_cv_lib_blacsCinit_Cblacs_pin
 #define HAVE_LIBBLACSCINIT 1
 _ACEOF
 
-  LIBS="-lblacsCinit $LIBS"
+  LIBS="-lmpiblacsCinit $LIBS"
 
 else
 
@@ -3844,13 +3844,13 @@ fi
 
 
 
-echo "$as_me:$LINENO: checking for blacs_pinfo__ in -lblacsF77init" >&5
-echo $ECHO_N "checking for blacs_pinfo__ in -lblacsF77init... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for blacs_pinfo__ in -lmpiblacsF77init" >&5
+echo $ECHO_N "checking for blacs_pinfo__ in -lmpiblacsF77init... $ECHO_C" >&6
 if test "${ac_cv_lib_blacsF77init_blacs_pinfo__+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lblacsF77init  $LIBS"
+LIBS="-lmpiblacsF77init  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3913,7 +3913,7 @@ if test $ac_cv_lib_blacsF77init_blacs_pi
 #define HAVE_LIBBLACSF77INIT 1
 _ACEOF
 
-  LIBS="-lblacsF77init $LIBS"
+  LIBS="-lmpiblacsF77init $LIBS"
 
 else
 


Index: R-RScaLAPACK.spec
===================================================================
RCS file: /cvs/extras/rpms/R-RScaLAPACK/devel/R-RScaLAPACK.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- R-RScaLAPACK.spec	24 Sep 2008 20:15:42 -0000	1.28
+++ R-RScaLAPACK.spec	24 Sep 2008 21:08:34 -0000	1.29
@@ -8,7 +8,7 @@
 
 Name: R-%{packname}
 Version: 0.5.1
-Release: 16%{?dist}
+Release: 17%{?dist}
 Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
 License: MIT
 URL: http://cran.r-project.org/contrib
@@ -88,6 +88,9 @@
 %{_libdir}/R/library/%{packname}/
 
 %changelog
+* Wed Sep 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.1-17
+- forgot to add one patch
+
 * Wed Sep 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.1-16
 - use openmpi instead of lam