rpms/R/EL-5 R-make-search-index.sh,1.1,1.2 R.spec,1.35,1.36
Tom Callaway
spot at fedoraproject.org
Wed Mar 4 20:50:41 UTC 2009
Author: spot
Update of /cvs/pkgs/rpms/R/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28746/EL-5
Modified Files:
R-make-search-index.sh R.spec
Log Message:
fix EPEL R-make-search-index.sh, improve java scriptlet
Index: R-make-search-index.sh
===================================================================
RCS file: /cvs/pkgs/rpms/R/EL-5/R-make-search-index.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- R-make-search-index.sh 6 Jul 2007 22:07:28 -0000 1.1
+++ R-make-search-index.sh 4 Mar 2009 20:50:11 -0000 1.2
@@ -3,9 +3,19 @@
# Figure out what RHOME is set to
TMP_R_HOME=`R RHOME`
-# Write out all the contents in arch and noarch library locations
-cat $TMP_R_HOME/library/*/CONTENTS > $TMP_R_HOME/doc/html/search/index.txt 2>/dev/null
-cat /usr/share/R/library/*/CONTENTS >> $TMP_R_HOME/doc/html/search/index.txt 2>/dev/null
+# 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
exit 0
Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/EL-5/R.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- R.spec 5 Jan 2009 15:11:49 -0000 1.35
+++ R.spec 4 Mar 2009 20:50:11 -0000 1.36
@@ -6,7 +6,7 @@
Name: R
Version: 2.8.1
-Release: 2%{?dist}
+Release: 3%{?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
@@ -286,16 +286,12 @@
done
/sbin/ldconfig
R CMD javareconf \
- JAR=%{jar} \
- JAVA=%{java} \
- JAVAC=%{javac} \
- JAVA_HOME=%{java_home}/jre \
- JAVAH=%{java_home}/bin/javah \
- JAVA_CPPFLAGS='-I%{java_home}/include\ -I%{java_home}/include/linux' \
- JAVA_LIBS='-L%{java_home}/jre/lib/%{java_arch}/server \
- -L%{java_home}/jre/lib/%{java_arch}\ -L%{java_home}/lib/%{java_arch} \
+ JAVA_HOME=%{_jvmdir}/jre \
+ JAVA_CPPFLAGS='-I%{_jvmdir}/java/include\ -I%{_jvmdir}/java/include/linux' \
+ JAVA_LIBS='-L%{_jvmdir}/jre/lib/%{java_arch}/server \
+ -L%{_jvmdir}/jre/lib/%{java_arch}\ -L%{_jvmdir}/java/lib/%{java_arch} \
-L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \
- JAVA_LD_LIBRARY_PATH=%{java_home}/jre/lib/%{java_arch}/server:%{java_home}/jre/lib/%{java_arch}:%{java_home}/lib/%{java_arch}:/usr/java/packages/lib/%{java_arch}:/lib:/usr/lib \
+ JAVA_LD_LIBRARY_PATH=%{_jvmdir}/jre/lib/%{java_arch}/server:%{_jvmdir}/jre/lib/%{java_arch}:%{_jvmdir}/java/lib/%{java_arch}:/usr/java/packages/lib/%{java_arch}:/lib:/usr/lib \
> /dev/null 2>&1 || exit 0
# Update package indices
@@ -330,6 +326,10 @@
/sbin/ldconfig
%changelog
+* Wed Mar 4 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-3
+- fix R-make-search-index.sh (bz 487022)
+- update post scriptlet (bz 477076)
+
* Mon Jan 5 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.8.1-2
- add pango-devel to BuildRequires (thanks to Martyn Plummer and Peter Dalgaard)
- fix libRmath requires to need V-R (thanks to Martyn Plummer)
More information about the scm-commits
mailing list