rpms/R-RScaLAPACK/EL-5 R-RScaLAPACK.spec,1.20,1.21

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/R-RScaLAPACK/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24345

Modified Files:
	R-RScaLAPACK.spec 
Log Message:
* Thu Oct 29 2009 Orion Poplawski <orion at cora.nwra.com> 0.5.1-10
- Update spec and rebuild with new R



Index: R-RScaLAPACK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-RScaLAPACK/EL-5/R-RScaLAPACK.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- R-RScaLAPACK.spec	26 Aug 2007 23:16:35 -0000	1.20
+++ R-RScaLAPACK.spec	29 Oct 2009 20:28:58 -0000	1.21
@@ -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: MIT
-URL: http://cran.r-project.org/contrib
+URL: http://cran.r-project.org/web/packages/RScaLAPACK/index.html
 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: R-core, scalapack, lam-libs
+Requires(post): R-core
+Requires(postun): R-core
 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
@@ -60,10 +62,10 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/R/libra
 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,-)
@@ -71,6 +73,9 @@ cat %{_libdir}/R/library/*/CONTENTS > %{
 %{_libdir}/R/library/%{packname}/
 
 %changelog
+* Thu Oct 29 2009 Orion Poplawski <orion at cora.nwra.com> 0.5.1-10
+- Update spec and rebuild with new R
+
 * Fri Mar 30 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.5.1-9
 - include bitsize specific lam include directory