- fix linicui18n detection

[packages/R.git] / R.spec

diff --git a/R.spec b/R.spec
index 45bbceea3db29d67e8a92dc133cec8f0712b48d1..014b467ae0765f4cc62714054c6e9fcaf2d5cb40 100644 (file)
--- a/R.spec
+++ b/R.spec
@@ -4,45 +4,49 @@
 %bcond_without tests           # do not run "make check"
 #
 # TODO:
+# - WTF is empty -recommended package with P/O which belong to -base ???
 # - script for rpm to autoprovides/autorequires R internals
 #
-%define        KernSmooth_version      2.22r19
-%define        VR_version              7.2r30
-%define        boot_version            1.2r27
-%define        cluster_version         1.11.4
-%define        foreign_version         0.8r18
-%define        lattice_version         0.14r16
-%define        mgcv_version            1.3r22
-%define        nlme_version            3.1r78
-%define        rpart_version           3.1r33
-%define        survival_version        2.30
+%define        KernSmooth_version      2.22r22
+%define        VR_version              7.2r45
+%define        boot_version            1.2r34
+%define        cluster_version         1.11.11
+%define        foreign_version         0.8r29
+%define        lattice_version         0.17r17
+%define        mgcv_version            1.4r1.1
+%define        nlme_version            3.1r89
+%define        rpart_version           3.1r42
+%define        survival_version        2.34r1
 
 %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.6.0
-Release:       0.2
+Version:       2.8.1
+Release:       0.1
 License:       Mixed (distributable), mostly GPL
 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: 97e5d2542349925962b7469456d45731
+# Source0-md5: acd40621b8942a2464daa2f9cef3273d
 Source1:       %{name}.desktop
 URL:           http://www.r-project.org/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: blas-devel
 BuildRequires: bzip2-devel
+BuildRequires: cairo-devel
 BuildRequires: gcc-c++
 BuildRequires: gcc-fortran
 BuildRequires: gettext-devel
-#BuildRequires:        lapack-devel >= 3.1.1
+BuildRequires: lapack-devel >= 3.1.1-4
+BuildRequires: libicu-devel
 BuildRequires: libjpeg-devel >= 6b
 BuildRequires: libpng-devel >= 1.0.5
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 2.6.26
+BuildRequires: pango-devel
 BuildRequires: pcre-devel
 BuildRequires: perl-base >= 1:5.6
 BuildRequires: readline-devel
@@ -53,6 +57,8 @@ BuildRequires:        tetex-latex
 BuildRequires: tetex-pdftex
 %{?with_tcl:BuildRequires:     tk-devel}
 BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXmu-devel
+BuildRequires: xorg-lib-libXt-devel
 BuildRequires: zip
 BuildRequires: zlib-devel >= 1.1.3
 #Requires:     lpr
@@ -120,7 +126,7 @@ Summary(pl.UTF-8):  Zalecane dodatkowe pakiety do języka R
 License:       GPL, free or free for non-commercial use
 Group:         Development/Languages
 URL:           http://www.ci.tuwien.ac.at/R/
-Requires(post,postun): R-base
+Requires(post,postun): R-base = %{version}-%{release}
 Requires(post,postun): perl-base
 Requires(post,postun): textutils
 Requires:      R-base = %{version}-%{release}
@@ -175,13 +181,20 @@ dystrubuowane w archiwum CRAN (Comprehensive R Archive Network).
        --with-libpng \
        --with-jpeglib \
        --with-blas \
+       --with-lapack \
        --with-readline \
        --with%{!?with_tcl:out}-tcltk \
+       --with-cairo \
+       --with-libpng \
+       --with-jpeglib \
+       --with-system-zlib \
+       --with-system-bzlib \
+       --with-system-pcre \
+       --with-iconv \
+       --with-ICU \
+       --with-x \
        --with-recommended-packages
 
-# R gets into infinite loop in src/library/grDevices when this is enabled
-#      --with-lapack \
-
 %{__make}
 %if %{with tests}
 %{__make} check