rpms/R/devel R.spec,1.53,1.54

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/R/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28746/devel

Modified Files:
	R.spec 
Log Message:
fix EPEL R-make-search-index.sh, improve java scriptlet


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/R.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- R.spec	23 Feb 2009 22:44:31 -0000	1.53
+++ R.spec	4 Mar 2009 20:50:11 -0000	1.54
@@ -6,7 +6,7 @@
 
 Name: R
 Version: 2.8.1
-Release: 3%{?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
@@ -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,9 @@
 /sbin/ldconfig
 
 %changelog
+* Wed Mar  4 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-4
+- update post scriptlet (bz 477076)
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild