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

[Tom Callaway (spot)]

Author: spot

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

Modified Files:
	R-RScaLAPACK.spec 
Log Message:

Rebuild for BuildID, license tag fixes



Index: R-RScaLAPACK.spec
===================================================================
RCS file: /cvs/extras/rpms/R-RScaLAPACK/devel/R-RScaLAPACK.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- R-RScaLAPACK.spec	30 Mar 2007 21:15:21 -0000	1.19
+++ R-RScaLAPACK.spec	26 Aug 2007 23:16:45 -0000	1.20
@@ -1,7 +1,7 @@
 %define packname RScaLAPACK
 %define lamdir %{_libdir}/lam
 
-%ifarch x86_64 ia64
+%ifarch x86_64 ia64 ppc64 sparc64
 %define bitsize 64
 %else
 %define bitsize 32
@@ -9,15 +9,17 @@
 
 Name: R-%{packname}
 Version: 0.5.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
-License: Freely distributable
+License: MIT
 URL: http://cran.r-project.org/contrib
 Group: Applications/Engineering
 Summary: An interface to perform parallel computation on linear algebra problems using ScaLAPACK
 BuildRequires: lam-libs, lam-devel, R-devel, tetex-latex, lapack-devel
 BuildRequires: gcc-gfortran, blacs-devel, scalapack-devel, autoconf
 Requires: R, scalapack, lam-libs
+Requires(post): R
+Requires(postun): R
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: R-RScaLAPACK-0.4.0-lam-mpi-blacs.patch
 Patch1: R-RScaLAPACK-0.5.1-gcc4.patch
@@ -32,7 +34,7 @@
 ScaLAPACK library for the linear algebra computations.
 
 %prep
-%setup -T -c -a 0
+%setup -q -c -n %{packname}
 %ifarch x86_64 ppc64 sparc64 ia64 alpha
 %patch2 -p1
 %else
@@ -45,32 +47,38 @@
 %build
 cd RScaLAPACK
 autoconf
-cd ..
-cp %{packname}/DESCRIPTION .
 
 %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/ -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}
+# Clean up in advance of check
 test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
 rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css
 
+%check
+# Check is pretty darned broken.
+# %%{_bindir}/R CMD check %{packname}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt
+%{_R_make_search_index}
 
 %postun
-cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt
+%{_R_make_search_index}
 
 %files
 %defattr(-,root,root,-)
-%doc DESCRIPTION
 %{_libdir}/R/library/%{packname}/
 
 %changelog
+* Sun Aug 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.5.1-10
+- modernize spec file
+- fix license tag
+- rebuild for BuildID
+
 * Fri Mar 30 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.5.1-9
 - include bitsize specific lam include directory