diff --git a/R-make-search-index.sh b/R-make-search-index.sh index 069d1a9..e233086 100755 --- a/R-make-search-index.sh +++ b/R-make-search-index.sh @@ -1,34 +1,7 @@ #!/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` - -# Figure out what R_DOC_DIR is set to -# 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 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 - -fi +# This script used to do something, now it doesn't. +# Why are you reading this? exit 0 diff --git a/R.spec b/R.spec index c17b257..45a16bf 100644 --- a/R.spec +++ b/R.spec @@ -16,8 +16,8 @@ %endif Name: R -Version: 3.0.0 -Release: 2%{?dist} +Version: 3.0.1 +Release: 1%{?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-3/R-%{version}.tar.gz @@ -312,6 +312,12 @@ make (cd src/nmath/standalone; make) #make check-all make pdf +# What a hack. +# Current texinfo doesn't like @eqn. Use @math instead where stuff breaks. +cp doc/manual/R-exts.texi doc/manual/R-exts.texi.spot +cp doc/manual/R-intro.texi doc/manual/R-intro.texi.spot +sed -i 's|@eqn|@math|g' doc/manual/R-exts.texi +sed -i 's|@eqn|@math|g' doc/manual/R-intro.texi make info # Convert to UTF-8 @@ -322,6 +328,9 @@ done %install make DESTDIR=${RPM_BUILD_ROOT} install install-info +# And now, undo the hack. :P +mv doc/manual/R-exts.texi.spot doc/manual/R-exts.texi +mv doc/manual/R-intro.texi.spot doc/manual/R-intro.texi make DESTDIR=${RPM_BUILD_ROOT} install-pdf rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir @@ -797,6 +806,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri May 17 2013 Tom Callaway - 3.0.1-1 +- update to 3.0.1 + * Sat Apr 13 2013 Tom Callaway - 3.0.0-2 - add Requires: tex(inconsolata.sty) to -core-devel to fix module PDF building diff --git a/sources b/sources index 282054a..93c9ded 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5fb80535b0e144a978f67aa2158015de R-3.0.0.tar.gz +36d51544b007fff26c7fbf36b02ea5ad R-3.0.1.tar.gz