[R-RScaLAPACK/f15] rebuild for R 2.14.0

[Tom Callaway]

commit b388e966f561bdffcb959855ac2ebd775457a314
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Wed Nov 9 15:48:04 2011 -0500

    rebuild for R 2.14.0

 R-RScaLAPACK.spec |   35 ++++++++---------------------------
 1 files changed, 8 insertions(+), 27 deletions(-)
---
diff --git a/R-RScaLAPACK.spec b/R-RScaLAPACK.spec
index f120eef..6ea2a62 100644
--- a/R-RScaLAPACK.spec
+++ b/R-RScaLAPACK.spec
@@ -1,26 +1,8 @@
 %define packname RScaLAPACK
 
-# These macros will go away soon. Hopefully.
-%global _openmpi_load \
- . /etc/profile.d/modules.sh; \
- module load openmpi-%{_arch}; \
- export CFLAGS="$CFLAGS";
-%global _openmpi_unload \
- . /etc/profile.d/modules.sh; \
- module unload openmpi-%{_arch};
-
-# The scalapack packages should probably provide this.
-%global _scalapack_openmpi_load \
- . /etc/profile.d/modules.sh; \
- module load scalapack-openmpi-%{_arch}; \
- export CFLAGS="$CFLAGS";
-%global _scalapack_openmpi_unload \
- . /etc/profile.d/modules.sh; \
- module unload scalapack-openmpi-%{_arch};
-
 Name: R-%{packname}
 Version: 0.6.1
-Release: 6%{?dist}
+Release: 8%{?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
@@ -29,7 +11,6 @@ Summary: An interface to perform parallel computation on linear algebra problems
 BuildRequires: openmpi-devel, R-devel, tetex-latex, lapack-devel, blas-devel, atlas-devel
 BuildRequires: gcc-gfortran, blacs-openmpi-devel, scalapack-openmpi-devel, autoconf, automake
 Requires: R-core, scalapack-openmpi, openmpi
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: R-RScaLAPACK-0.5.1-mpi-blacs.patch
 Patch3: R-RScaLAPACK-0.6.1-configurefix.patch
 Patch6: R-RScaLAPACK-0.6.1-mpicc.patch
@@ -84,7 +65,6 @@ export MPI_COMPILER=openmpi
 OPENMPICFLAGS="$CFLAGS"
 OPENMPILDFLAGS="-L$MPI_LIB"
 OPENMPI_INCLUDE="-I$MPI_INCLUDE"
-%{_scalapack_openmpi_load}
 export RPM_OPT_FLAGS="%{optflags}"
 export CFLAGS="$RPM_OPT_FLAGS $LDFLAGS $OPENMPILDFLAGS -lutil -lmpiblacsCinit -lmpiblacs -lmpi -llapack"
 export CC=mpicc
@@ -92,8 +72,7 @@ export F77=mpif77
 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/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}
+                         --configure-args="--with-blacs=%{_libdir}/openmpi/lib/ --with-lapack=%{_libdir} --with-blas=%{_libdir} --with-atlas=%{_libdir}/atlas/ --with-scalapack=%{_libdir}/openmpi/lib CC=mpicc FFLAGS='$RPM_OPT_FLAGS $LDFLAGS $OPENMPILDFLAGS -lutil -llapack -lmpi'" %{packname}
 %{_openmpi_unload}
 
 # Clean up in advance of check
@@ -104,14 +83,16 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css
 # Check is pretty darned broken.
 # %%{_bindir}/R CMD check %{packname}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %{_libdir}/R/library/%{packname}/
 
 %changelog
+* Wed Nov  9 2011 Tom Callaway <spot at fedoraproject.org> - 0.6.1-8
+- rebuild for R 2.14.0
+
+* Thu Aug  4 2011 Tom Callaway <spot at fedoraproject.org> - 0.6.1-7
+- fix package against cleaned up scalapack
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild