X-Git-Url: http://git.pld-linux.org/?p=packages%2FR.git;a=blobdiff_plain;f=R.spec;h=1731a57b73e9c949ba7c78312ee548a3601a2315;hp=9deebb8e72f1877acfaa18266e4d782c6a5ab686;hb=60526098f998b387debc544373126a17cfbc2540;hpb=028203b98922bd334124e4710e4d974e258e9c25

diff --git a/R.spec b/R.spec
index 9deebb8..1731a57 100644
--- a/R.spec
+++ b/R.spec
@@ -7,21 +7,19 @@
 # - /etc/localtime must be present for tests to work
 #
 # TODO:
-# - 755 for %{_libdir}/R/library/*/libs/*.so
-# - %lang( ) for %{_libdir}/R/library/*/po/* dirs
 # - script for rpm to autoprovides/autorequires R internals
 #
 %include	/usr/lib/rpm/macros.perl
 Summary:	A language for data analysis and graphics
 Summary(pl.UTF-8):	Język do analizy danych oraz grafiki
 Name:		R
-Version:	2.14.2
-Release:	1
+Version:	2.15.1
+Release:	5
 License:	Mixed (distributable), mostly GPL v2+
 Group:		Development/Languages
 # CRAN master site: ftp://cran.r-project.org/pub/R/src/
 Source0:	ftp://stat.ethz.ch/R-CRAN/src/base/R-2/%{name}-%{version}.tar.gz
-# Source0-md5:	f5c8657543a293a80d025be58cf1ef71
+# Source0-md5:	fcdf247e707fdade82b78bcf911a54f1
 Source1:	%{name}.desktop
 Source2:	%{name}.xpm
 URL:		http://www.r-project.org/
@@ -31,7 +29,7 @@ BuildRequires:	blas-devel >= 3.2.2-2
 BuildRequires:	bzip2-devel >= 1.0.6
 BuildRequires:	cairo-devel >= 1.6
 BuildRequires:	gcc-fortran
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-devel >= 0.14.5
 BuildRequires:	lapack-devel >= 3.2.2-2
 BuildRequires:	libicu-devel
 BuildRequires:	libjpeg-devel >= 6b
@@ -89,6 +87,14 @@ Język R był zainspirowany dwoma istniejącymi językami: S (Beckera,
 Chambersa i Wilksa) oraz Scheme (Sussmana). R jest podobny do S, ale
 implementacja i semantyka wywodzi się ze Scheme.
 
+%package java
+Summary:	R Java classes
+Group:		Development/Libraries
+Requires:	%{name} = %{version}
+
+%description java
+R Java classes.
+
 %prep
 %setup -q
 
@@ -98,6 +104,8 @@ implementacja i semantyka wywodzi się ze Scheme.
 install -d build
 cd build
 ../%configure \
+	F77=gfortran \
+	FC=gfortran \
 	--enable-R-shlib \
 	--enable-largefile \
 	--with-ICU \
@@ -115,7 +123,7 @@ cd build
 	--with%{!?with_tcl:out}-tcltk \
 	--with-x
 
-%{__make}
+%{__make} -j1
 
 %if %{with tests}
 %{__make} check
@@ -183,7 +191,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/R
 %dir %{_libdir}/R/lib
 %attr(755,root,root) %{_libdir}/R/lib/libR.so
-%{_libdir}/libR.so
+%attr(755,root,root) %{_libdir}/libR.so
 %{_libdir}/R/COPYING
 %{_libdir}/R/NEWS
 %{_libdir}/R/SVN-REVISION
@@ -205,7 +213,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/R/share
 %{_libdir}/R/share/R
 %{_libdir}/R/share/encodings
-%{_libdir}/R/share/java
 %{_libdir}/R/share/licenses
 %dir %{_libdir}/R/share/locale
 # locale files list is autogenerated (see R.files above)
@@ -218,3 +225,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/libR.pc
 %{_mandir}/man1/R.1*
 %{_mandir}/man1/Rscript*
+
+%files java
+%defattr(644,root,root,755)
+%{_libdir}/R/share/java