rpms/R/FC-6 R.spec,1.21,1.22

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/R/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22008/FC-6

Modified Files:
	R.spec 
Log Message:

* Tue Mar  13 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.1-4
- (FC7+) get rid of termcap related requires, replace with ncurses
- (FC7+) use java-1.5.0-gcj instead of old java-1.4.2
- add /usr/share/R/library as a valid R_LIBS directory for noarch bits




Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-6/R.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- R.spec	20 Dec 2006 00:47:34 -0000	1.21
+++ R.spec	17 Mar 2007 15:54:32 -0000	1.22
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.4.1
-Release: 1%{?dist}
+Release: 4%{?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
@@ -98,6 +98,9 @@
 %setup -q
 
 %build
+# Add PATHS to Renviron for R_LIBS
+echo 'R_LIBS=${R_LIBS-'"'%{_libdir}/R/library:%{_datadir}/R/library'"'}' >> etc/Renviron.in
+
 export R_PDFVIEWER="%{_bindir}/evince"
 export R_PRINTCMD="lpr"
 export R_BROWSER="%{_bindir}/firefox"
@@ -219,6 +222,9 @@
 /sbin/ldconfig
 
 %changelog
+* Tue Mar  13 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.1-4
+- add /usr/share/R/library as a valid R_LIBS directory for noarch bits
+
 * Tue Dec 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.1-1
 - bump to 2.4.1
 - fix install-info invocations in post/preun (bz 219407)