- up to 2.0.0

- separate not base modules to other specs(not ready yet - use R-spec.sh)
- NFY

Changed files:
    R.spec -> 1.56

diff --git a/R.spec b/R.spec
index e291e149f8c57e68a9f8d4104025823fc480567f..96c2861d77ef4737d19fc3bfe2def806dffe71ea 100644 (file)
--- a/R.spec
+++ b/R.spec
@@ -1,7 +1,4 @@
 # TODO:
-# - add more contrib packages
-# - separate contrib packages to other specs
-# - (?) separate recomended packages to other specs (i'm not sure...)
 # - move perl R libraries to standard perl location
 #
 # Conditional build:
@@ -10,60 +7,15 @@
 Summary:       A language for data analysis and graphics
 Summary(pl):   Jêzyk do analizy danych oraz grafiki
 Name:          R
-Version:       1.9.1
-Release:       4
+Version:       2.0.0
+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/%{name}-%{version}.tgz
-# Source0-md5: c8201425506e5c077ef1936e19ea2f51
-Source1:       ftp://stat.ethz.ch/R-CRAN/src/contrib/KernSmooth_2.22-13.tar.gz
-# Source1-md5: 15f5ab6094ea848f02b5109f40055128
-Source2:       ftp://stat.ethz.ch/R-CRAN/src/contrib/VR_7.2-4.tar.gz
-# Source2-md5: 15882d679f7704597194ab4be40e1a62
-Source3:       ftp://stat.ethz.ch/R-CRAN/src/contrib/acepack_1.3-2.1.tar.gz
-# Source3-md5: eb75cab587664b58df4a14c65f450b62
-Source4:       ftp://stat.ethz.ch/R-CRAN/src/contrib/boot_1.2-17.tar.gz
-# Source4-md5: 88a0bc20efe532f30b0606b99394a3f4
-Source5:       ftp://stat.ethz.ch/R-CRAN/src/contrib/bootstrap_1.0-12.tar.gz
-# Source5-md5: 6860c7d62ab95756267be774bcf60578
-Source6:       ftp://stat.ethz.ch/R-CRAN/src/contrib/cluster_1.9.6.tar.gz
-# Source6-md5: 6baba1d66491f6c4fab70d9128df2ccd
-Source7:       ftp://stat.ethz.ch/R-CRAN/src/contrib/date_1.2-18.tar.gz
-# Source7-md5: 8bb9d6bc5cb0b06e250be6f478cf4c2a
-Source8:       ftp://stat.ethz.ch/R-CRAN/src/contrib/e1071_1.4-1.tar.gz
-# Source8-md5: 806fc46915d14640e6d01cfa590422e5
-Source9:       ftp://stat.ethz.ch/R-CRAN/src/contrib/foreign_0.6-11.tar.gz
-# Source9-md5: 6ebc52bc959d27eff06e50b83818bf77
-Source10:      ftp://stat.ethz.ch/R-CRAN/src/contrib/fracdiff_1.1-1.tar.gz
-# Source10-md5:        e1f624b063789f21c74d85ebaeda60fa
-Source11:      ftp://stat.ethz.ch/R-CRAN/src/contrib/gee_4.13-10.tar.gz
-# Source11-md5:        7f32a7f7b022dd366d27482a3561d2a6
-Source12:      ftp://stat.ethz.ch/R-CRAN/src/contrib/lattice_0.9-16.tar.gz
-# Source12-md5:        c98c91ccea8880c79d30aab4e2cca63b
-Source13:      ftp://stat.ethz.ch/R-CRAN/src/contrib/leaps_2.7.tar.gz
-# Source13-md5:        551d8cd9a53d2eee7c13108577910a44
-Source14:      ftp://stat.ethz.ch/R-CRAN/src/contrib/mgcv_1.0-9.tar.gz
-# Source14-md5:        ba1585b777c886444d0470c8f831f983
-Source15:      ftp://stat.ethz.ch/R-CRAN/src/contrib/mlbench_1.0-0.tar.gz
-# Source15-md5:        101108689bd005ef96641a8c33f17698
-Source16:      ftp://stat.ethz.ch/R-CRAN/src/contrib/nlme_3.1-50.tar.gz
-# Source16-md5:        6d210f59cb96fda0e3b9644e6085da5a
-Source17:      ftp://stat.ethz.ch/R-CRAN/src/contrib/oz_1.0-9.tar.gz
-# Source17-md5:        0eae69fafcabbe14dff81ff00ef3e4fa
-Source18:      ftp://stat.ethz.ch/R-CRAN/src/contrib/polynom_1.1-15.tar.gz
-# Source18-md5:        bc17210955f5a49834531ba1bdc1b0e9
-Source19:      ftp://stat.ethz.ch/R-CRAN/src/contrib/princurve_1.1-6.tar.gz
-# Source19-md5:        8c36f2fef3265890f8393dac6d89fdc5
-Source20:      ftp://stat.ethz.ch/R-CRAN/src/contrib/quadprog_1.4-7.tar.gz
-# Source20-md5:        d93eb133e72e89de717c9db9d5f28d66
-Source21:      ftp://stat.ethz.ch/R-CRAN/src/contrib/rpart_3.1-17.tar.gz
-# Source21-md5:        378fb531cac466b6abb774da00846e43
-Source22:      ftp://stat.ethz.ch/R-CRAN/src/contrib/survival_2.13-1.tar.gz
-# Source22-md5:        cae71a003c742e42675dbdd9b9da371f
-Source23:      ftp://stat.ethz.ch/R-CRAN/src/contrib/xgobi_1.2-12.tar.gz
-# Source23-md5:        3edae689c69c12ef71df1ee269c1b1b8
-Source26:      %{name}.desktop
+Source0:       ftp://stat.ethz.ch/R-CRAN/src/base/R-2/%{name}-%{version}.tar.gz
+# Source0-md5: 3900bca37cabb4b76b8d736d51cc9251
+# Source0-size:        10676072
+Source1:       %{name}.desktop
 URL:           http://www.r-project.org/
 BuildRequires: XFree86-devel
 BuildRequires: autoconf
@@ -84,11 +36,10 @@ BuildRequires:      tetex-pdftex
 BuildRequires: zip
 BuildRequires: zlib >= 1.1.3
 #BuildRequires:        lpr
+#Requires:     lpr
 %{!?_without_gnome:BuildRequires:      gnome-libs-devel}
 %{!?_without_gnome:BuildRequires:      ORBit-devel}
 %{!?_without_gnome:BuildRequires:      libglade-gnome-devel}
-Provides:      R-base
-Provides:      R-contrib
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -119,8 +70,18 @@ License:    GPL v2 / LGPL
 Group:         Development/Languages
 Requires(post):        textutils
 Requires(post):        perl
-Provides:      R-ctest R-eda R-lqs R-methods R-modreg R-mva R-nls R-splines
-Provides:      R-stepfun R-tcltk R-tools R-ts R-grid
+Provides:      R-base
+Provides:       R-datasets
+Provides:       R-grid
+Provides:       R-graphics
+Provides:       R-grDevices
+Provides:       R-methods
+Provides:       R-utils
+Provides:       R-tcltk
+Provides:       R-splines
+Provides:       R-stats
+Provides:       R-stats4
+Provides:       R-tools
 
 %description base
 R is a language and run-time environment for carrying out interactive
@@ -203,33 +164,8 @@ machine learning methods.
 Ten podpakiet R zawiera zestaw rzeczywistych danych i funkcji do
 tworzenia sztucznych danych s³u¿±cych jako test wydajno¶ci metod
 uczenia maszyny.
-
 %prep
-%setup -q -c -n R-cran -T -b 1
-%setup -q -c -n R-cran -T -D -b 2
-%setup -q -c -n R-cran -T -D -b 3
-%setup -q -c -n R-cran -T -D -b 4
-%setup -q -c -n R-cran -T -D -b 5
-%setup -q -c -n R-cran -T -D -b 6
-%setup -q -c -n R-cran -T -D -b 7
-%setup -q -c -n R-cran -T -D -b 8
-%setup -q -c -n R-cran -T -D -b 9
-%setup -q -c -n R-cran -T -D -b 10
-%setup -q -c -n R-cran -T -D -b 11
-%setup -q -c -n R-cran -T -D -b 12
-%setup -q -c -n R-cran -T -D -b 13
-%setup -q -c -n R-cran -T -D -b 14
-%setup -q -c -n R-cran -T -D -b 15
-%setup -q -c -n R-cran -T -D -b 16
-%setup -q -c -n R-cran -T -D -b 17
-%setup -q -c -n R-cran -T -D -b 18
-%setup -q -c -n R-cran -T -D -b 19
-%setup -q -c -n R-cran -T -D -b 20
-%setup -q -c -n R-cran -T -D -b 21
-%setup -q -c -n R-cran -T -D -b 22
-%setup -q -c -n R-cran -T -D -b 23
 %setup -q
-#%setup -q -T -D -a 14
 
 # These files have the path for PERL hard-coded as /usr/local/bin/perl
 # We need to remove them to avoid dependency problems
@@ -242,139 +178,54 @@ cp -f /usr/share/automake/config.* .
 %configure \
        %{!?_without_gnome:--with-gnome} \
        %{?_without_gnome:--without-gnome} \
-       --without-tcltk \
-       --enable-R-shlib
+       --enable-R-shlib \
+       --enable-linux-lfs \
+       --with-zlib \
+       --with-bzlib \
+       --with-pcre \
+       --without-recommended-packages
 
 %{__make}
+%{__make} check
+%{__make} docs
 %{__make} help
 %{__make} html
-%{__make} clean
-
-# Install contrib packages
-#
-R_HOME=`pwd`;export R_HOME
-PERL5LIB=`pwd`/share/perl;export PERL5LIB
-cd ../R-cran
-for pkg in `ls`
-do
-${R_HOME}/bin/INSTALL ${pkg}
-done
-cd ${R_HOME}
-
-#Remove old template files.
-#
-for oldinfile in `find . -name '*.in' -print`
-do
-       mv ${oldinfile} ${oldinfile}.old
-#      rm ${oldinfile}
-done
-
-# Gather documentation from contrib packages in one directory
-# Assume that anything not in one of the standard directories is
-# documentation, and copy it.
-#
-mkdir ${R_HOME}/contrib
-cd ${RPM_BUILD_DIR}/R-cran
-for pkg in `ls`; do
-        if [ -d ${pkg} ]; then
-               mkdir ${R_HOME}/${pkg}
-                for docfile in `ls ${pkg}`; do
-                        case $docfile in
-                                INDEX) ;;
-                                TITLE) ;;
-                                R) ;;
-                                man) ;;
-                                src) ;;
-                                src-c) ;;
-                                data) ;;
-                                *) cp -R -P ${pkg}/${docfile} ${R_HOME};;
-                        esac
-                done
-        fi
-done
-cd ${R_HOME}
+%{__make} info
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_libdir}/R,%{_includedir},%{_desktopdir}}
 
-install %{SOURCE26} $RPM_BUILD_ROOT%{_desktopdir}
-
-cp doc/R.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+%{__make} install \
+       rhome=$RPM_BUILD_ROOT%{_libdir}/R \
+       mandir=$RPM_BUILD_ROOT%{_mandir} \
+       bindir=$RPM_BUILD_ROOT%{_bindir} \
+       
 
-cp -R AUTHORS afm bin doc etc library modules share \
-       $RPM_BUILD_ROOT%{_libdir}/R
-sed "s,`pwd`,%{_libdir}/R,g" < bin/R > $RPM_BUILD_ROOT%{_libdir}/R/bin/R
-ln -sf %{_libdir}/R/bin/R $RPM_BUILD_ROOT%{_bindir}/R
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
 find $RPM_BUILD_ROOT%{_libdir}/R -name 'Makefile*' -exec rm -f {} \;
-rm -rf $RPM_BUILD_ROOT%{_libdir}/R/etc/*.old
-
-mv $RPM_BUILD_ROOT%{_libdir}/R/bin/libR*.so $RPM_BUILD_ROOT%{_libdir}
-
-cp -R include $RPM_BUILD_ROOT%{_includedir}/R
+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
+rm $RPM_BUILD_ROOT%{_bindir}/%{name}
+sed -i -e "s#$RPM_BUILD_ROOT##g" $RPM_BUILD_ROOT%{_libdir}/%{name}/bin/%{name}
+ln -sf %{_libdir}/%{name}/bin/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerun -- R-base < 1.9.1-2
-if [ -d %{_libdir}/R/include -a ! -L %{_libdir}/R/include ]; then
-       install -d %{_includedir}/R
-       mv %{_libdir}/R/include/* %{_includedir}/R
-       rm -rf %{_libdir}/R/include
-       ln -sf %{_includedir}/R %{_libdir}/R/include
-fi
-
-%post base
+%post
 (cd %{_libdir}/R/library; umask 022; cat */CONTENTS > ../doc/html/search/index.txt
  R_HOME=%{_libdir}/R ../bin/Rcmd perl ../share/perl/build-help.pl --htmllist)
 /sbin/ldconfig
 
-%postun        base    -p /sbin/ldconfig
-
-#%preun base
-## These files are not owned by any package, so we have to remove them
-## but only if this is the last version of R-base on the system.
-##
-#if [ "$1" = 0 ];
-#then
-#      rm -f %{_libdir}/R/doc/html/search/index.txt
-#      rm -f %{_libdir}/R/doc/html/packages.html
-#fi
-
-%post contrib
-(cd %{_libdir}/R/library; umask 022; cat */CONTENTS > ../doc/html/search/index.txt
- R_HOME=%{_libdir}/R ../bin/Rcmd perl ../share/perl/build-help.pl --htmllist)
-
-%postun contrib
-if [ -f ../bin/Rcmd ];then
-(cd %{_libdir}/R/library; umask 022; cat */CONTENTS > ../doc/html/search/index.txt
- R_HOME=%{_libdir}/R ../bin/Rcmd perl ../share/perl/build-help.pl --htmllist)
-fi
-
-%post recommended
-(cd %{_libdir}/R/library; umask 022; cat */CONTENTS > ../doc/html/search/index.txt
- R_HOME=%{_libdir}/R ../bin/Rcmd perl ../share/perl/build-help.pl --htmllist)
-
-%postun recommended
-if [ -f ../bin/Rcmd ];then
-(cd %{_libdir}/R/library; umask 022; cat */CONTENTS > ../doc/html/search/index.txt
- R_HOME=%{_libdir}/R ../bin/Rcmd perl ../share/perl/build-help.pl --htmllist)
-fi
-
-%post mlbench
-(cd %{_libdir}/R/library; umask 022; cat */CONTENTS > ../doc/html/search/index.txt
- R_HOME=%{_libdir}/R ../bin/Rcmd perl ../share/perl/build-help.pl --htmllist)
-
-%postun mlbench
-if [ -f ../bin/Rcmd ];then
-(cd %{_libdir}/R/library; umask 022; cat */CONTENTS > ../doc/html/search/index.txt
- R_HOME=%{_libdir}/R ../bin/Rcmd perl ../share/perl/build-help.pl --htmllist)
-fi
+%postun        -p /sbin/ldconfig
 
 %files base
 %defattr(644,root,root,755)
+%doc COPYRIGHTS FAQ NEWS README RESOURCES THANKS Y2K
+
 %{_mandir}/man1/R.1*
 %attr(755,root,root) %{_bindir}/R
 %dir %{_libdir}/R
@@ -387,28 +238,6 @@ fi
 %{_libdir}/R/share
 %{_libdir}/R/AUTHORS
 %dir %{_libdir}/R/library
-%{_libdir}/R/library/*.css
-%{_libdir}/R/library/base
-%{_libdir}/R/library/ctest
-%{_libdir}/R/library/eda
-%{_libdir}/R/library/grid
-%{_libdir}/R/library/graphics
-%{_libdir}/R/library/lqs
-%{_libdir}/R/library/methods
-%{_libdir}/R/library/mle
-%{_libdir}/R/library/modreg
-%{_libdir}/R/library/mva
-%{_libdir}/R/library/nls
-%{_libdir}/R/library/splines
-%{_libdir}/R/library/stats
-%{_libdir}/R/library/stats4
-%{_libdir}/R/library/stepfun
-%{_libdir}/R/library/tcltk
-%{_libdir}/R/library/tools
-%{_libdir}/R/library/ts
-%{_libdir}/R/library/utils
-%{_libdir}/R/modules
-%doc BUGS COPYRIGHTS FAQ NEWS README RESOURCES THANKS Y2K
 # %{_libdir}/R/doc %except %{_libdir}/R/doc/html/{packages.html,search/index.txt}
 %dir %{_libdir}/R/doc
 %{_libdir}/R/doc/[KRm]*
@@ -423,60 +252,17 @@ fi
 %ghost %{_libdir}/R/doc/html/packages.html
 %{_desktopdir}/*
 
-%files recommended
-%defattr(644,root,root,755)
-%{_libdir}/R/library/MASS
-%{_libdir}/R/library/class
-%{_libdir}/R/library/nnet
-%{_libdir}/R/library/spatial
-%doc VR
-%{_libdir}/R/library/KernSmooth
-%doc KernSmooth
-%{_libdir}/R/library/boot
-%doc boot
-%{_libdir}/R/library/cluster
-%doc cluster
-%{_libdir}/R/library/foreign
-%doc foreign
-%{_libdir}/R/library/lattice
-%doc lattice
-%{_libdir}/R/library/mgcv
-%doc mgcv
-%{_libdir}/R/library/nlme
-%doc nlme
-%{_libdir}/R/library/rpart
-%doc rpart
-%{_libdir}/R/library/survival
-%doc survival
-
-%files contrib
-%defattr(644,root,root,755)
-%{_libdir}/R/library/acepack
-%doc acepack
-%{_libdir}/R/library/bootstrap
-%doc bootstrap
-%{_libdir}/R/library/date
-%doc date
-%{_libdir}/R/library/e1071
-%doc e1071
-%{_libdir}/R/library/fracdiff
-%doc fracdiff
-%{_libdir}/R/library/gee
-%doc gee
-%{_libdir}/R/library/leaps
-%doc leaps
-%{_libdir}/R/library/oz
-%doc oz
-%{_libdir}/R/library/polynom
-%doc polynom
-%{_libdir}/R/library/princurve
-%doc princurve
-%{_libdir}/R/library/quadprog
-%doc quadprog
-%{_libdir}/R/library/xgobi
-%doc xgobi
-
-%files mlbench
-%defattr(644,root,root,755)
-%{_libdir}/R/library/mlbench
-%doc mlbench
+%attr(755,root,root) %{_libdir}/%{name}/modules
+
+%{_libdir}/%{name}/library/base
+%{_libdir}/%{name}/library/datasets
+%{_libdir}/%{name}/library/grid
+%{_libdir}/%{name}/library/graphics
+%{_libdir}/%{name}/library/grDevices
+%{_libdir}/%{name}/library/methods
+%{_libdir}/%{name}/library/utils
+%{_libdir}/%{name}/library/tcltk
+%{_libdir}/%{name}/library/splines
+%{_libdir}/%{name}/library/stats
+%{_libdir}/%{name}/library/stats4
+%{_libdir}/%{name}/library/tools