From 9d6fa355016b292bb1e08994950192077ecc38b4 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Tue, 29 Apr 2008 20:09:52 +0000
Subject: [PATCH] .

---
 .cvsignore             |  2 +-
 R-make-search-index.sh |  8 +++++++-
 R.spec                 | 22 ++++++++++++++--------
 sources                |  2 +-
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 9729ef8..442f991 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-R-2.6.2.tar.gz
+R-2.7.0.tar.gz
diff --git a/R-make-search-index.sh b/R-make-search-index.sh
index fb4a462..94440c2 100755
--- a/R-make-search-index.sh
+++ b/R-make-search-index.sh
@@ -7,9 +7,15 @@ TMP_R_HOME=`R RHOME`
 # 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
 
diff --git a/R.spec b/R.spec
index 80fe35d..92a1ef4 100644
--- a/R.spec
+++ b/R.spec
@@ -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 @@ Requires: xdg-utils, cups
 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-methods = %{version}
 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-tools = %{version}
 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 @@ for doc in admin exts FAQ intro lang; do
    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 @@ fi
 /sbin/ldconfig
 
 %changelog
+* Mon Apr 28 2008 Tom "spot" Callaway <tcallawa@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@redhat.com> 2.6.2-1
 - properly version the items in the VR bundle
 - 2.6.2
diff --git a/sources b/sources
index 15d19e1..2a48996 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1099cbf02c624ceb459d9bbc4d0d1448  R-2.6.2.tar.gz
+9eaee3eceec1d5f72cea5640ca90768c  R-2.7.0.tar.gz