- pl for -java-tools

[packages/R.git] / R.spec

diff --git a/R.spec b/R.spec
index 208937cee9c1fddcf9260985263b6f433e511d26..5541fb86aa16ae944221348f1acf60ae4b29c078 100644 (file)
--- a/R.spec
+++ b/R.spec
@@ -14,13 +14,13 @@
 Summary:       A language for data analysis and graphics
 Summary(pl.UTF-8):     Język do analizy danych oraz grafiki
 Name:          R
-Version:       2.15.1
-Release:       5.1
+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: fcdf247e707fdade82b78bcf911a54f1
+# Source0-md5: 346d16bab26fcae15e53755be8a69b00
 Source1:       %{name}.desktop
 Source2:       %{name}.xpm
 URL:           http://www.r-project.org/
@@ -45,14 +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
 %endif
-%{?with_tcl:BuildRequires:     tk-devel >= 8.4}
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXmu-devel
 BuildRequires: xorg-lib-libXt-devel
@@ -92,12 +94,16 @@ implementacja i semantyka wywodzi się ze Scheme.
 
 %package java-tools
 Summary:       R Java tools
+Summary(pl.UTF-8):     Narzędzia R w Javie
 Group:         Development/Tools
 Requires:      %{name} = %{version}-%{release}
 
 %description java-tools
 R Java classes.
 
+%description java-tools -l pl.UTF-8
+Narzędzia R w Javie.
+
 %prep
 %setup -q
 
@@ -123,7 +129,13 @@ 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} -j1