rpms/R/F-12 R-make-search-index.sh,1.3,1.4

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/R/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14882/F-12

Modified Files:
	R-make-search-index.sh 
Log Message:
fix scriptlet noise caused by 2.10.0 search index changes


Index: R-make-search-index.sh
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-12/R-make-search-index.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- R-make-search-index.sh	29 Apr 2008 20:09:52 -0000	1.3
+++ R-make-search-index.sh	9 Nov 2009 03:09:20 -0000	1.4
@@ -1,5 +1,16 @@
 #!/bin/bash
 
+# Determine R versions
+R_SUPER_VERSION=`R --version | grep "R version" | cut -d " " -f 3 | cut -d "." -f 1`
+R_MAJOR_VERSION=`R --version | grep "R version" | cut -d " " -f 3 | cut -d "." -f 2`
+
+# If R 3.0.* ever comes out, we'll need to revisit this logic.
+# Or, just nuke this script and the macros entirely.
+if [ "$R_SUPER_VERSION" -ge "2" -a "$R_MAJOR_VERSION" -ge "10" ]; then
+  # echo "R is new enough to not need this anymore."
+  exit 0
+else
+
 # Figure out what RHOME is set to
 TMP_R_HOME=`R RHOME`
 
@@ -17,5 +28,7 @@ cat /usr/share/R/library/*/CONTENTS >> $
 # Don't use .. based paths, substitute /usr/share/R
 sed -i "s!../../..!/usr/share/R!g" $TMP_R_DOC_DIR/html/search/index.txt
 
+fi
+
 exit 0