rpms/R-RScaLAPACK/devel R-RScaLAPACK.spec,1.18,1.19

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/R-RScaLAPACK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17277/devel

Modified Files:
	R-RScaLAPACK.spec 
Log Message:

Fix building against new lam.



Index: R-RScaLAPACK.spec
===================================================================
RCS file: /cvs/extras/rpms/R-RScaLAPACK/devel/R-RScaLAPACK.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- R-RScaLAPACK.spec	4 Oct 2006 22:57:41 -0000	1.18
+++ R-RScaLAPACK.spec	30 Mar 2007 21:15:21 -0000	1.19
@@ -1,9 +1,15 @@
 %define packname RScaLAPACK
 %define lamdir %{_libdir}/lam
 
+%ifarch x86_64 ia64
+%define bitsize 64
+%else
+%define bitsize 32
+%endif
+
 Name: R-%{packname}
 Version: 0.5.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
 License: Freely distributable
 URL: http://cran.r-project.org/contrib
@@ -45,7 +51,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
-%{_bindir}/R CMD INSTALL --configure-args="CFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -L%{lamdir} -lutil -lmpiblacsCinit -lmpiblacs -llam -llamf77mpi -lmpi -llapack' FFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -L%{lamdir} -lutil -llapack'" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
+%{_bindir}/R CMD INSTALL --configure-args="CFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -I%{_includedir}/lam/%{bitsize} -L%{lamdir} -lutil -lmpiblacsCinit -lmpiblacs -llam -llamf77mpi -lmpi -llapack' FFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -I%{_includedir}/lam/%{bitsize} -L%{lamdir} -lutil -llapack'" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
 # %{_bindir}/R CMD check %{packname}
 test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
 rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css
@@ -65,6 +71,9 @@
 %{_libdir}/R/library/%{packname}/
 
 %changelog
+* Fri Mar 30 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.5.1-9
+- include bitsize specific lam include directory
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.1-8
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21