X-Git-Url: http://git.pld-linux.org/?p=packages%2FR.git;a=blobdiff_plain;f=R.spec;h=da0370595209fafe2c267f6f4d13680e2ba75f67;hp=76bc4893ec85b69de88362b2410c7d4ddae4e3f8;hb=ea85d5cb4a2a4f0e36271fd1ea793bc980a73e69;hpb=0592c089307a96c0a0c9cd96c9c97b4c283d6f87

diff --git a/R.spec b/R.spec
index 76bc489..da03705 100644
--- a/R.spec
+++ b/R.spec
@@ -1,27 +1,26 @@
 #
 # Conditional build
 %bcond_without	tcl		# disable tcl support
-%bcond_without	tests		# do not run "make check"
+%bcond_without	tests	# do not run "make check"
+%bcond_without	docs	# do not build documentation
 #
 # NOTE:
 # - /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.1
-Release:	4
+Version:	2.15.2
+Release:	1
 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:	ba5b6fb15b660670ea29b885348f322a
+# Source0-md5:	346d16bab26fcae15e53755be8a69b00
 Source1:	%{name}.desktop
 Source2:	%{name}.xpm
 URL:		http://www.r-project.org/
@@ -31,7 +30,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
@@ -46,12 +45,16 @@ BuildRequires:	perl-base >= 1:5.6
 BuildRequires:	pkgconfig
 BuildRequires:	readline-devel
 BuildRequires:	rpm-perlprov
-%{?with_tcl:BuildRequires:	tcl-devel >= 8.4}
+%if %{with tcl}
+BuildRequires:	tcl-devel >= 8.4
+BuildRequires:	tk-devel >= 8.4
+%endif
+%if %{with docs}
 BuildRequires:	tetex-dvips
 BuildRequires:	tetex-latex
 BuildRequires:	tetex-pdftex
 BuildRequires:	texinfo-texi2dvi >= 4.7
-%{?with_tcl:BuildRequires:	tk-devel >= 8.4}
+%endif
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXmu-devel
 BuildRequires:	xorg-lib-libXt-devel
@@ -89,6 +92,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-tools
+Summary:	R Java tools
+Group:		Development/Tools
+Requires:	%{name} = %{version}-%{release}
+
+%description java-tools
+R Java classes.
+
 %prep
 %setup -q
 
@@ -98,6 +109,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 \
@@ -112,16 +125,24 @@ cd build
 	--with-system-pcre \
 	--with-system-xz \
 	--with-system-zlib \
-	--with%{!?with_tcl:out}-tcltk \
+%if %{with tcl}
+	--with-tcltk \
+	--with-tcl-config=/usr/lib/tclConfig.sh \
+	--with-tk-config=/usr/lib/tkConfig.sh \
+%else
+	--without-tcltk \
+%endif
 	--with-x
 
-%{__make}
+%{__make} -j1
 
 %if %{with tests}
 %{__make} check
 %endif
 
+%if %{with docs}
 %{__make} docs pdf info
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -133,6 +154,8 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_libdir}/R,%{_includedir
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
+ln -sf %{_libdir}/R/lib/libR.so $RPM_BUILD_ROOT%{_libdir}
+
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/include $RPM_BUILD_ROOT%{_includedir}/R
 ln -sf %{_includedir}/R $RPM_BUILD_ROOT%{_libdir}/R/include
 
@@ -181,10 +204,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/R
 %dir %{_libdir}/R/lib
 %attr(755,root,root) %{_libdir}/R/lib/libR.so
+%attr(755,root,root) %{_libdir}/libR.so
 %{_libdir}/R/COPYING
 %{_libdir}/R/NEWS
 %{_libdir}/R/SVN-REVISION
 %attr(755,root,root) %{_libdir}/R/bin
+%exclude %{_libdir}/R/bin/javareconf
 # %{_libdir}/R/doc %except %{_libdir}/R/doc/html/{packages.html,search/index.txt}
 %dir %{_libdir}/R/doc
 %{_libdir}/R/doc/[KRm]*
@@ -202,7 +227,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)
@@ -215,3 +239,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/libR.pc
 %{_mandir}/man1/R.1*
 %{_mandir}/man1/Rscript*
+
+%files java-tools
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/R/bin/javareconf
+%{_libdir}/R/share/java