rpms/R-RScaLAPACK/devel R-RScaLAPACK.spec,1.38,1.39

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/R-RScaLAPACK/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8252

Modified Files:
	R-RScaLAPACK.spec 
Log Message:
fix blacs path passed to configure


Index: R-RScaLAPACK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-RScaLAPACK/devel/R-RScaLAPACK.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- R-RScaLAPACK.spec	8 Jul 2010 16:43:39 -0000	1.38
+++ R-RScaLAPACK.spec	8 Jul 2010 17:09:06 -0000	1.39
@@ -9,15 +9,6 @@
  . /etc/profile.d/modules.sh; \
  module unload openmpi-%{_arch};
 
-# The blacs packages should probably provide this.
-%global _blacs_openmpi_load \
- . /etc/profile.d/modules.sh; \
- module load blacs-openmpi-%{_arch}; \
- export CFLAGS="$CFLAGS";
-%global _blacs_openmpi_unload \
- . /etc/profile.d/modules.sh; \
- module unload blacs-openmpi-%{_arch};
-
 # The scalapack packages should probably provide this.
 %global _scalapack_openmpi_load \
  . /etc/profile.d/modules.sh; \
@@ -29,7 +20,7 @@
 
 Name: R-%{packname}
 Version: 0.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
 License: MIT
 URL: http://cran.r-project.org/web/packages/RScaLAPACK/index.html
@@ -93,20 +84,16 @@ export MPI_COMPILER=openmpi
 OPENMPICFLAGS="$CFLAGS"
 OPENMPILDFLAGS="-L$MPI_LIB"
 OPENMPI_INCLUDE="-I$MPI_INCLUDE"
-%{_blacs_openmpi_load}
-BLACSCFLAGS="$CFLAGS"
-BLACSLDFLAGS="$LDFLAGS"
 %{_scalapack_openmpi_load}
 export RPM_OPT_FLAGS="%{optflags}"
-export CFLAGS="$RPM_OPT_FLAGS $LDFLAGS $BLACSLDFLAGS $OPENMPILDFLAGS -lutil -lmpiblacsCinit -lmpiblacs -lmpi -llapack"
+export CFLAGS="$RPM_OPT_FLAGS $LDFLAGS $OPENMPILDFLAGS -lutil -lmpiblacsCinit -lmpiblacs -lmpi -llapack"
 export CC=mpicc
 export F77=mpif77
-export FFLAGS="$RPM_OPT_FLAGS $LDFLAGS $BLACSLDFLAGS $OPENMPILDFLAGS -lutil -llapack -lmpi"
+export FFLAGS="$RPM_OPT_FLAGS $LDFLAGS $OPENMPILDFLAGS -lutil -llapack -lmpi"
 export MPI_INCLUDE="$OPENMPI_INCLUDE"
 %{_bindir}/R CMD INSTALL --library=$RPM_BUILD_ROOT%{_libdir}/R/library \
-                         --configure-args="--with-blacs=%{_libdir}/openmpi/ --with-lapack=%{_libdir} --with-blas=%{_libdir} --with-atlas=%{_libdir}/atlas/ --with-scalapack=%{_libdir}/scalapack-openmpi/ CC=mpicc FFLAGS='$RPM_OPT_FLAGS $LDFLAGS $BLACSLDFLAGS $OPENMPILDFLAGS -lutil -llapack -lmpi'" %{packname}
+                         --configure-args="--with-blacs=%{_libdir}/openmpi/lib/ --with-lapack=%{_libdir} --with-blas=%{_libdir} --with-atlas=%{_libdir}/atlas/ --with-scalapack=%{_libdir}/scalapack-openmpi/ CC=mpicc FFLAGS='$RPM_OPT_FLAGS $LDFLAGS $OPENMPILDFLAGS -lutil -llapack -lmpi'" %{packname}
 %{_scalapack_openmpi_unload}
-%{_blacs_openmpi_unload}
 %{_openmpi_unload}
 
 # Clean up in advance of check
@@ -125,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/R/library/%{packname}/
 
 %changelog
+* Thu Jul  8 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.1-4
+- fix blacs path passed to configure
+
 * Thu Jul  8 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.1-3
 - drop scriptlets