rpms/R/devel .cvsignore, 1.14, 1.15 R-make-search-index.sh, 1.2, 1.3 R.spec, 1.40, 1.41 sources, 1.16, 1.17

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/R/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5996

Modified Files:
	.cvsignore R-make-search-index.sh R.spec sources 
Log Message:
.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	8 Feb 2008 19:27:58 -0000	1.14
+++ .cvsignore	29 Apr 2008 20:09:52 -0000	1.15
@@ -1 +1 @@
-R-2.6.2.tar.gz
+R-2.7.0.tar.gz


Index: R-make-search-index.sh
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/R-make-search-index.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- R-make-search-index.sh	8 Feb 2008 19:27:58 -0000	1.2
+++ R-make-search-index.sh	29 Apr 2008 20:09:52 -0000	1.3
@@ -7,9 +7,15 @@
 # Ideally, we could ask R just like we do for RHOME, but we can't yet.
 TMP_R_DOC_DIR=`grep "R_DOC_DIR=" /usr/bin/R | cut -d "=" -f 2`
 
-# Write out all the contents in arch and noarch library locations
+# Write out all the contents in arch library locations
 cat $TMP_R_HOME/library/*/CONTENTS > $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null
+# Don't use .. based paths, substitute TMP_R_HOME
+sed -i "s!../../..!$TMP_R_HOME!g" $TMP_R_DOC_DIR/html/search/index.txt
+
+# Write out all the contents in noarch library locations
 cat /usr/share/R/library/*/CONTENTS >> $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null
+# Don't use .. based paths, substitute /usr/share/R
+sed -i "s!../../..!/usr/share/R!g" $TMP_R_DOC_DIR/html/search/index.txt
 
 exit 0
 


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/R.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- R.spec	8 Feb 2008 19:27:58 -0000	1.40
+++ R.spec	29 Apr 2008 20:09:52 -0000	1.41
@@ -1,5 +1,5 @@
 Name: R
-Version: 2.6.2
+Version: 2.7.0
 Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
@@ -26,8 +26,8 @@
 Provides: R-base = %{version}
 Provides: R-boot = 1.2
 Provides: R-class = 7.2
-Provides: R-cluster = 1.11.9
-Provides: R-codetools = 0.1
+Provides: R-cluster = 1.11.10
+Provides: R-codetools = 0.2
 Provides: R-datasets = %{version}
 Provides: R-foreign = 0.8
 Provides: R-graphics = %{version}
@@ -40,7 +40,6 @@
 Provides: R-mgcv = 1.3
 Provides: R-nlme = 3.1
 Provides: R-nnet = 7.2
-Provides: R-rcompgen = 0.1
 Provides: R-rpart = 3.1
 Provides: R-spatial = 7.2
 Provides: R-splines = %{version}
@@ -52,9 +51,6 @@
 Provides: R-utils = %{version}
 Provides: R-VR = 7.2
 
-# Temporary fix to avoid the SNAFU of the 0.fdr.2.* release
-Conflicts: R-devel < %{version}-%{release}
-
 %description
 A language and environment for statistical computing and graphics. 
 R is similar to the award-winning S system, which was developed at 
@@ -239,13 +235,18 @@
    fi
 done
 /sbin/ldconfig
-R CMD javareconf || exit 0
+R CMD javareconf > /dev/null 2>&1 || exit 0
 
 # Update package indices
 %__cat %{_libdir}/R/library/*/CONTENTS > %{_docdir}/R-%{version}/html/search/index.txt 2>/dev/null
+# Don't use .. based paths, substitute RHOME
+sed -i "s!../../..!%{_libdir}/R!g" %{_docdir}/R-%{version}/html/search/index.txt
 
 # This could fail if there are no noarch R libraries on the system.
 %__cat %{_datadir}/R/library/*/CONTENTS >> %{_docdir}/R-%{version}/html/search/index.txt 2>/dev/null || exit 0
+# Don't use .. based paths, substitute /usr/share/R
+sed -i "s!../../..!/usr/share/R!g" %{_docdir}/R-%{version}/html/search/index.txt
+
 
 %preun 
 if [ $1 = 0 ]; then
@@ -268,6 +269,11 @@
 /sbin/ldconfig
 
 %changelog
+* Mon Apr 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-1
+- update to 2.70
+- rcompgen is no longer a standalone package
+- redirect javareconf to /dev/null (bz 442366)
+
 * Fri Feb  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.2-1
 - properly version the items in the VR bundle
 - 2.6.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	8 Feb 2008 19:27:58 -0000	1.16
+++ sources	29 Apr 2008 20:09:52 -0000	1.17
@@ -1 +1 @@
-1099cbf02c624ceb459d9bbc4d0d1448  R-2.6.2.tar.gz
+9eaee3eceec1d5f72cea5640ca90768c  R-2.7.0.tar.gz