fix EPEL R-make-search-index.sh, improve java scriptlet
This commit is contained in:
parent
b92049a616
commit
69cb16f957
22
R.spec
22
R.spec
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
Name: R
|
Name: R
|
||||||
Version: 2.8.1
|
Version: 2.8.1
|
||||||
Release: 2%{?dist}
|
Release: 4%{?dist}
|
||||||
Summary: A language for data analysis and graphics
|
Summary: A language for data analysis and graphics
|
||||||
URL: http://www.r-project.org
|
URL: http://www.r-project.org
|
||||||
Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
|
Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
|
||||||
@ -286,16 +286,12 @@ for doc in admin exts FAQ intro lang; do
|
|||||||
done
|
done
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
R CMD javareconf \
|
R CMD javareconf \
|
||||||
JAR=%{jar} \
|
JAVA_HOME=%{_jvmdir}/jre \
|
||||||
JAVA=%{java} \
|
JAVA_CPPFLAGS='-I%{_jvmdir}/java/include\ -I%{_jvmdir}/java/include/linux' \
|
||||||
JAVAC=%{javac} \
|
JAVA_LIBS='-L%{_jvmdir}/jre/lib/%{java_arch}/server \
|
||||||
JAVA_HOME=%{java_home}/jre \
|
-L%{_jvmdir}/jre/lib/%{java_arch}\ -L%{_jvmdir}/java/lib/%{java_arch} \
|
||||||
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} \
|
|
||||||
-L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \
|
-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
|
> /dev/null 2>&1 || exit 0
|
||||||
|
|
||||||
# Update package indices
|
# Update package indices
|
||||||
@ -330,6 +326,12 @@ fi
|
|||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 4 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 2.8.1-4
|
||||||
|
- update post scriptlet (bz 477076)
|
||||||
|
|
||||||
|
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||||
|
|
||||||
* Mon Jan 5 2009 Tom "spot" Callaway <tcallawa@redhat.com> 2.8.1-2
|
* Mon Jan 5 2009 Tom "spot" Callaway <tcallawa@redhat.com> 2.8.1-2
|
||||||
- add pango-devel to BuildRequires (thanks to Martyn Plummer and Peter Dalgaard)
|
- add pango-devel to BuildRequires (thanks to Martyn Plummer and Peter Dalgaard)
|
||||||
- fix libRmath requires to need V-R (thanks to Martyn Plummer)
|
- fix libRmath requires to need V-R (thanks to Martyn Plummer)
|
||||||
|
Loading…
Reference in New Issue
Block a user