X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=R.spec;h=d94a31b3f56656419f8a046a0970bdbc8f2b8ada;hb=032044a6353722cca91506e6b3ca82b9194792f6;hp=e012a63bf7fb5931db19d918bf00b4b44347382d;hpb=d81d405ef9ce61449e44404570dc37429a3b5a50;p=packages%2FR.git

diff --git a/R.spec b/R.spec
index e012a63..d94a31b 100644
--- a/R.spec
+++ b/R.spec
@@ -7,57 +7,62 @@
 # - /etc/localtime must be present for tests to work
 #
 # TODO:
-# - faulty build on i486 (test stats-Ex.R):
-#	error in optim(init[mask], getLike, method = "L-BFGS-B", lower = rep(0,  :
-#          non-finite value supplied by optim
+# - 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.9.1
+Version:	2.15.0
 Release:	1
-License:	Mixed (distributable), mostly GPL
+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:	54a79eebdf0cec3fd2c489fc94d99b00
+# Source0-md5:	905f638990492618559202cc1e48a867
 Source1:	%{name}.desktop
+Source2:	%{name}.xpm
 URL:		http://www.r-project.org/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.62
 BuildRequires:	automake
-BuildRequires:	blas-devel
-BuildRequires:	bzip2-devel
-BuildRequires:	cairo-devel
-BuildRequires:	gcc-c++
+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:	lapack-devel >= 3.1.1-4
+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:	libtool
+BuildRequires:	libtiff-devel
+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}
+%{?with_tcl:BuildRequires:	tcl-devel >= 8.4}
 BuildRequires:	tetex-dvips
 BuildRequires:	tetex-latex
 BuildRequires:	tetex-pdftex
-%{?with_tcl:BuildRequires:	tk-devel}
+BuildRequires:	texinfo-texi2dvi >= 4.7
+%{?with_tcl:BuildRequires:	tk-devel >= 8.4}
 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
+Requires:	blas >= 3.2.2-2
+Suggests:	rkward
 Obsoletes:	R-base
 Obsoletes:	R-contrib
 Obsoletes:	R-recommended
@@ -90,88 +95,99 @@ implementacja i semantyka wywodzi się ze Scheme.
 %build
 %{__aclocal} -I m4
 %{__autoconf}
-%configure \
+install -d build
+cd build
+../%configure \
 	--enable-R-shlib \
-	--enable-linux-lfs \
-	--with-system-zlib \
-	--with-system-bzlib \
-	--with-system-pcre \
-	--with-libpng \
-	--with-jpeglib \
+	--enable-largefile \
+	--with-ICU \
 	--with-blas \
-	--with-lapack \
-	--with-readline \
-	--with%{!?with_tcl:out}-tcltk \
 	--with-cairo \
-	--with-libpng \
 	--with-jpeglib \
-	--with-system-zlib \
+	--with-lapack \
+	--with-libpng \
+	--with-readline \
+	--with-recommended-packages \
 	--with-system-bzlib \
 	--with-system-pcre \
-	--with-iconv \
-	--with-ICU \
-	--with-x \
-	--with-recommended-packages
+	--with-system-xz \
+	--with-system-zlib \
+	--with%{!?with_tcl:out}-tcltk \
+	--with-x
 
 %{__make}
+
 %if %{with tests}
 %{__make} check
 %endif
-%{__make} docs help pdf html info
+
+%{__make} docs pdf info
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_libdir}/R,%{_includedir},%{_desktopdir}}
-install -d $RPM_BUILD_ROOT%{perl_vendorlib}/{R,Text}
+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}
+
+ln -sf %{_libdir}/R/lib/libR.so $RPM_BUILD_ROOT%{_libdir}
 
-mv $RPM_BUILD_ROOT%{_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
 
-(cd $RPM_BUILD_ROOT%{_libdir}/%{name}/share/perl/R/
-for f in * ; do
-  ln -s %{_libdir}/%{name}/share/perl/R/$f $RPM_BUILD_ROOT%{perl_vendorlib}/R/
-done)
-(cd $RPM_BUILD_ROOT%{_libdir}/%{name}/share/perl/Text
-for f in * ; do
-  ln -s %{_libdir}/%{name}/share/perl/Text/$f $RPM_BUILD_ROOT%{perl_vendorlib}/Text/
-done)
-
-rm -r $RPM_BUILD_ROOT%{perl_vendorlib}/{Text,R}
-rm -r $RPM_BUILD_ROOT%{_libdir}/R/share/perl/{File,Text}
-mv    $RPM_BUILD_ROOT%{_libdir}/R/share/perl/R $RPM_BUILD_ROOT%{perl_vendorlib}
+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
+%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}
-
-%{_mandir}/man1/R.1*
-%{_mandir}/man1/Rscript*
 %attr(755,root,root) %{_bindir}/R
 %attr(755,root,root) %{_bindir}/Rscript
 %dir %{_libdir}/R
-%attr(755,root,root) %{_libdir}/R/bin
-%attr(755,root,root) %{_libdir}/libR*.so
-%{_libdir}/R/etc
-%{_libdir}/R/include
-%{_includedir}/R
-%{_libdir}/R/share
+%dir %{_libdir}/R/lib
+%attr(755,root,root) %{_libdir}/R/lib/libR.so
+%{_libdir}/libR.so
 %{_libdir}/R/COPYING
 %{_libdir}/R/NEWS
 %{_libdir}/R/SVN-REVISION
-%dir %{_libdir}/R/library
-%{_libdir}/%{name}/library/R.css
+%attr(755,root,root) %{_libdir}/R/bin
 # %{_libdir}/R/doc %except %{_libdir}/R/doc/html/{packages.html,search/index.txt}
 %dir %{_libdir}/R/doc
 %{_libdir}/R/doc/[KRm]*
@@ -180,41 +196,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/R/doc/html/[Ra-lr-u]*.html
 %{_libdir}/R/doc/html/packages-head*.html
 %{_libdir}/R/doc/html/*.jpg
-%dir %{_libdir}/R/doc/html/search
-%{_libdir}/R/doc/html/search/[A-Z]*
-%ghost %{_libdir}/R/doc/html/search/index.txt
 %ghost %{_libdir}/R/doc/html/packages.html
-%{_desktopdir}/*.desktop
-
-%{perl_vendorlib}/R
-
-%attr(755,root,root) %{_libdir}/%{name}/modules
-
-%{_libdir}/%{name}/library/KernSmooth
-%{_libdir}/%{name}/library/MASS
-%{_libdir}/%{name}/library/base
-%{_libdir}/%{name}/library/boot
-%{_libdir}/%{name}/library/class
-%{_libdir}/%{name}/library/cluster
-%{_libdir}/%{name}/library/codetools
-%{_libdir}/%{name}/library/datasets
-%{_libdir}/%{name}/library/foreign
-%{_libdir}/%{name}/library/grDevices
-%{_libdir}/%{name}/library/graphics
-%{_libdir}/%{name}/library/grid
-%{_libdir}/%{name}/library/lattice
-%{_libdir}/%{name}/library/methods
-%{_libdir}/%{name}/library/mgcv
-%{_libdir}/%{name}/library/nlme
-%{_libdir}/%{name}/library/nnet
-%{_libdir}/%{name}/library/rpart
-%{_libdir}/%{name}/library/spatial
-%{_libdir}/%{name}/library/splines
-%{_libdir}/%{name}/library/stats
-%{_libdir}/%{name}/library/stats4
-%{_libdir}/%{name}/library/survival
-%{_libdir}/%{name}/library/tcltk
-%{_libdir}/%{name}/library/tools
-%{_libdir}/%{name}/library/utils
-
-%{_pkgconfigdir}/*.pc
+%{_libdir}/R/etc
+%{_libdir}/R/include
+%dir %{_libdir}/R/library
+# library files list is autogenerated (see R.files above)
+%attr(755,root,root) %{_libdir}/R/modules
+%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)
+%{_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*