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

diff --git a/R.spec b/R.spec
index b12a1b2..da03705 100644
--- a/R.spec
+++ b/R.spec
@@ -1,7 +1,8 @@
 #
 # 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
@@ -13,50 +14,53 @@
 Summary:	A language for data analysis and graphics
 Summary(pl.UTF-8):	Język do analizy danych oraz grafiki
 Name:		R
-Version:	2.13.1
-Release:	2
+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:	28dd0d68ac3a0eab93fe7035565a1c30
+# Source0-md5:	346d16bab26fcae15e53755be8a69b00
 Source1:	%{name}.desktop
 Source2:	%{name}.xpm
-Patch0:		%{name}-install.patch
 URL:		http://www.r-project.org/
-BuildRequires:	autoconf >= 2.60
+BuildRequires:	autoconf >= 2.62
 BuildRequires:	automake
 BuildRequires:	blas-devel >= 3.2.2-2
-BuildRequires:	bzip2-devel
+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
-BuildRequires:	libpng-devel >= 1.0.5
+BuildRequires:	libpng-devel >= 1.2.7
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtiff-devel
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2.0
 BuildRequires:	libxml2-devel >= 2.6.26
 BuildRequires:	pango-devel
-BuildRequires:	pcre-devel
+BuildRequires:	pcre-devel >= 7.6
 BuildRequires:	perl-base >= 1:5.6
 BuildRequires:	pkgconfig
 BuildRequires:	readline-devel
 BuildRequires:	rpm-perlprov
-%{?with_tcl:BuildRequires:	tcl-devel}
+%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
-%{?with_tcl:BuildRequires:	tk-devel}
+BuildRequires:	texinfo-texi2dvi >= 4.7
+%endif
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXmu-devel
 BuildRequires:	xorg-lib-libXt-devel
 BuildRequires:	xz-devel >= 4.999
 BuildRequires:	zip
-BuildRequires:	zlib-devel >= 1.1.3
+BuildRequires:	zlib-devel >= 1.2.3
 #Requires:	lpr
 Requires(post):	perl-base
 Requires(post):	textutils
@@ -88,14 +92,25 @@ 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
-%patch0 -p1
 
 %build
 %{__aclocal} -I m4
 %{__autoconf}
-%configure \
+install -d build
+cd build
+../%configure \
+	F77=gfortran \
+	FC=gfortran \
 	--enable-R-shlib \
 	--enable-largefile \
 	--with-ICU \
@@ -110,46 +125,91 @@ implementacja i semantyka wywodzi się ze Scheme.
 	--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
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_libdir}/R,%{_includedir},%{_desktopdir},%{_pixmapsdir}}
 
-%{__make} -j1 install \
+%{__make} -C build -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
-mv $RPM_BUILD_ROOT%{_libdir}/R/lib/libR*.so $RPM_BUILD_ROOT%{_libdir}
+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
 
+gen_lang() {
+	dir="$1"
+	for d in $RPM_BUILD_ROOT${dir}/* ; do
+		bd=$(basename $d)
+		lang="${bd%@*}"
+		echo "%lang($lang) ${dir}/${bd}"
+	done
+}
+
+gen_lang %{_libdir}/R/share/locale > R.files
+for moddir in $RPM_BUILD_ROOT%{_libdir}/R/library/* ; do
+	module=$(basename $moddir)
+	echo "%dir %{_libdir}/R/library/${module}"
+	for f in $moddir/* ; do
+		bf=$(basename $f)
+		case "$bf" in
+		  po)
+			echo "%dir %{_libdir}/R/library/${module}/po"
+			gen_lang %{_libdir}/R/library/${module}/po
+			;;
+		  libs)
+			echo "%dir %{_libdir}/R/library/${module}/libs"
+			echo "%attr(755,root,root) %{_libdir}/R/library/${module}/libs/*.so"
+			;;
+		  *)
+			echo "%{_libdir}/R/library/${module}/${bf}"
+			;;
+		esac
+	done
+done >> R.files
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%files
+%files -f R.files
 %defattr(644,root,root,755)
 %doc NEWS README doc/{AUTHORS,COPYRIGHTS,FAQ,RESOURCES,THANKS}
 %attr(755,root,root) %{_bindir}/R
 %attr(755,root,root) %{_bindir}/Rscript
-%attr(755,root,root) %{_libdir}/libR*.so
 %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]*
@@ -162,39 +222,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/R/etc
 %{_libdir}/R/include
 %dir %{_libdir}/R/library
-%{_libdir}/R/library/KernSmooth
-%{_libdir}/R/library/MASS
-%{_libdir}/R/library/Matrix
-%{_libdir}/R/library/base
-%{_libdir}/R/library/boot
-%{_libdir}/R/library/class
-%{_libdir}/R/library/cluster
-%{_libdir}/R/library/codetools
-%{_libdir}/R/library/compiler
-%{_libdir}/R/library/datasets
-%{_libdir}/R/library/foreign
-%{_libdir}/R/library/grDevices
-%{_libdir}/R/library/graphics
-%{_libdir}/R/library/grid
-%{_libdir}/R/library/lattice
-%{_libdir}/R/library/methods
-%{_libdir}/R/library/mgcv
-%{_libdir}/R/library/nlme
-%{_libdir}/R/library/nnet
-%{_libdir}/R/library/rpart
-%{_libdir}/R/library/spatial
-%{_libdir}/R/library/splines
-%{_libdir}/R/library/stats
-%{_libdir}/R/library/stats4
-%{_libdir}/R/library/survival
-%{_libdir}/R/library/tcltk
-%{_libdir}/R/library/tools
-%{_libdir}/R/library/utils
+# library files list is autogenerated (see R.files above)
 %attr(755,root,root) %{_libdir}/R/modules
-%{_libdir}/R/share
+%dir %{_libdir}/R/share
+%{_libdir}/R/share/R
+%{_libdir}/R/share/encodings
+%{_libdir}/R/share/licenses
+%dir %{_libdir}/R/share/locale
+# locale files list is autogenerated (see R.files above)
+%{_libdir}/R/share/make
+%{_libdir}/R/share/sh
+%{_libdir}/R/share/texmf
 %{_desktopdir}/R.desktop
 %{_pixmapsdir}/R.xpm
 %{_includedir}/R
 %{_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