rpms/R/devel R.csh,1.1,1.2 R.sh,1.1,1.2 R.spec,1.57,1.58

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/R/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27960/devel

Modified Files:
	R.csh R.sh R.spec 
Log Message:
fix profile scripts to handle case where R_HOME is already defined


Index: R.csh
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/R.csh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- R.csh	25 Mar 2009 01:55:47 -0000	1.1
+++ R.csh	28 Mar 2009 16:42:48 -0000	1.2
@@ -1,4 +1,7 @@
 # Some R modules are not smart enough to ask R for the value of RHOME
 # and instead depend on the R_HOME environment variable.
-set RHOME = `R RHOME`
-setenv R_HOME $RHOME
+# Set R_HOME only if it is not already set.
+if ( ${?R_HOME} == 0 ) then
+  set RHOME = `R RHOME`
+  setenv R_HOME $RHOME
+endif


Index: R.sh
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/R.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- R.sh	25 Mar 2009 01:55:47 -0000	1.1
+++ R.sh	28 Mar 2009 16:42:48 -0000	1.2
@@ -1,3 +1,4 @@
 # Some R modules are not smart enough to ask R for the value of RHOME
 # and instead depend on the R_HOME environment variable.
-export R_HOME="`R RHOME`"
+# Set R_HOME only if it is not already set.
+test "a$R_HOME" = "a" && export R_HOME="`R RHOME`"


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/R.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- R.spec	25 Mar 2009 01:59:42 -0000	1.57
+++ R.spec	28 Mar 2009 16:42:48 -0000	1.58
@@ -6,7 +6,7 @@
 
 Name: R
 Version: 2.8.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -962,6 +962,10 @@
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Sat Mar 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-8
+- fix profile scripts for situation where R_HOME is already defined
+  (bugzilla 492706)
+
 * Tue Mar 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-7
 - bump for new tag