S: rkward (gui)

[packages/R.git] / R.spec

diff --git a/R.spec b/R.spec
index 14808053c7ea97968f1d37c3678bdbe00d0aeb18..f60e849bcb410bef0f4457c645473a401a0da9d9 100644 (file)
--- a/R.spec
+++ b/R.spec
@@ -16,13 +16,13 @@
 Summary:       A language for data analysis and graphics
 Summary(pl.UTF-8):     Język do analizy danych oraz grafiki
 Name:          R
-Version:       2.10.0
-Release:       3
+Version:       2.11.0
+Release:       2
 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: 4486934883b1dbcd5400135e22b26a75
+# Source0-md5: c6c1e866299f533617750889c729bfb3
 Source1:       %{name}.desktop
 URL:           http://www.r-project.org/
 BuildRequires: autoconf
@@ -43,6 +43,7 @@ BuildRequires:        libxml2-devel >= 2.6.26
 BuildRequires: pango-devel
 BuildRequires: pcre-devel
 BuildRequires: perl-base >= 1:5.6
+BuildRequires: pkgconfig
 BuildRequires: readline-devel
 BuildRequires: rpm-perlprov
 %{?with_tcl:BuildRequires:     tcl-devel}
@@ -53,11 +54,13 @@ BuildRequires:      tetex-pdftex
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXmu-devel
 BuildRequires: xorg-lib-libXt-devel
+BuildRequires: xz-devel
 BuildRequires: zip
 BuildRequires: zlib-devel >= 1.1.3
 #Requires:     lpr
 Requires(post):        perl-base
 Requires(post):        textutils
+Suggests:      rkward
 Obsoletes:     R-base
 Obsoletes:     R-contrib
 Obsoletes:     R-recommended
@@ -96,6 +99,7 @@ implementacja i semantyka wywodzi się ze Scheme.
        --with-system-zlib \
        --with-system-bzlib \
        --with-system-pcre \
+       --with-system-xz \
        --with-libpng \
        --with-jpeglib \
        --with-blas \
@@ -142,8 +146,8 @@ 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}
+rm -r $RPM_BUILD_ROOT%{perl_vendorlib}/R
+rm -r $RPM_BUILD_ROOT%{_libdir}/R/share/perl/File
 mv    $RPM_BUILD_ROOT%{_libdir}/R/share/perl/R $RPM_BUILD_ROOT%{perl_vendorlib}
 
 %clean
@@ -180,9 +184,6 @@ 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