- upgraded to 1.4.1

- separated recommended modules into R-recommended package
- fixed license strings
- NFY, but builds

Changed files:
    R.spec -> 1.25

diff --git a/R.spec b/R.spec
index 19dced869b5a403d958f8e9860eada8d568bc5b3..850b1e17b503400ed5fd528a25fd749c4743ccb3 100644 (file)
--- a/R.spec
+++ b/R.spec
@@ -5,39 +5,40 @@
 Summary:       A language for data analysis and graphics
 Summary(pl):   Jêzyk do analizy danych oraz grafiki
 Name:          R
-Version:       1.4.0
+Version:       1.4.1
 Release:       1
 Source0:       ftp://stat.ethz.ch/R-CRAN/src/base/%{name}-%{version}.tgz
-Source1:       ftp://stat.ethz.ch/R-CRAN/src/contrib/mlbench_0.5-4.tar.gz
-Source2:       ftp://stat.ethz.ch/R-CRAN/src/contrib/VR_6.3-1.tar.gz
+Source1:       ftp://stat.ethz.ch/R-CRAN/src/contrib/KernSmooth_2.22-7.tar.gz
+Source2:       ftp://stat.ethz.ch/R-CRAN/src/contrib/VR_6.3-2.tar.gz
 Source3:       ftp://stat.ethz.ch/R-CRAN/src/contrib/acepack_1.3.tar.gz
-Source4:       ftp://stat.ethz.ch/R-CRAN/src/contrib/bootstrap_1.0-9.tar.gz
-Source5:       ftp://stat.ethz.ch/R-CRAN/src/contrib/cluster_1.3-6.tar.gz
-Source6:       ftp://stat.ethz.ch/R-CRAN/src/contrib/date_1.2-11.tar.gz
-Source7:       ftp://stat.ethz.ch/R-CRAN/src/contrib/e1071_1.2-1.tar.gz
-Source8:       ftp://stat.ethz.ch/R-CRAN/src/contrib/fracdiff_1.0-7.tar.gz
-Source9:       ftp://stat.ethz.ch/R-CRAN/src/contrib/gee_4.13-6.tar.gz
-#Source10:     ftp://stat.ethz.ch/R-CRAN/src/contrib/integrate_2.2-3.tar.gz
-# Source11:    ftp://stat.ethz.ch/R-CRAN/src/contrib/jpn_1.0-1.tar.gz
-Source12:      ftp://stat.ethz.ch/R-CRAN/src/contrib/leaps_2.1-1.tar.gz
-Source13:      ftp://stat.ethz.ch/R-CRAN/src/contrib/oz_1.0-6.tar.gz
-Source14:      ftp://stat.ethz.ch/R-CRAN/src/contrib/polynom_1.1-8.tar.gz
-Source15:      ftp://stat.ethz.ch/R-CRAN/src/contrib/princurve_1.1-3.tar.gz
-Source16:      ftp://stat.ethz.ch/R-CRAN/src/contrib/quadprog_1.4-3.tar.gz
-# Source17:    ftp://stat.ethz.ch/R-CRAN/src/contrib/ratetables_1.0-2.tar.gz
-# Source18:    ftp://stat.ethz.ch/R-CRAN/src/contrib/rational_1.0-1.tar.gz
-Source19:      ftp://stat.ethz.ch/R-CRAN/src/contrib/survival_2.6.tar.gz
-Source20:      ftp://stat.ethz.ch/R-CRAN/src/contrib/xgobi_1.2-5.tar.gz
-Patch0:                R-destdir.patch
-# Patch0:              %{name}-0.61.rpm.patch3
-License:       GPL
+Source4:       ftp://stat.ethz.ch/R-CRAN/src/contrib/boot_1.2-7.tar.gz
+Source5:       ftp://stat.ethz.ch/R-CRAN/src/contrib/bootstrap_1.0-9.tar.gz
+Source6:       ftp://stat.ethz.ch/R-CRAN/src/contrib/cluster_1.4-0.tar.gz
+Source7:       ftp://stat.ethz.ch/R-CRAN/src/contrib/date_1.2-12.tar.gz
+Source8:       ftp://stat.ethz.ch/R-CRAN/src/contrib/e1071_1.2-1.tar.gz
+Source9:       ftp://stat.ethz.ch/R-CRAN/src/contrib/foreign_0.4-9.tar.gz
+Source10:      ftp://stat.ethz.ch/R-CRAN/src/contrib/fracdiff_1.0-7.tar.gz
+Source11:      ftp://stat.ethz.ch/R-CRAN/src/contrib/gee_4.13-6.tar.gz
+Source12:      ftp://stat.ethz.ch/R-CRAN/src/contrib/leaps_2.4.tar.gz
+Source13:      ftp://stat.ethz.ch/R-CRAN/src/contrib/mgcv_0.7-1.tar.gz
+Source14:      ftp://stat.ethz.ch/R-CRAN/src/contrib/mlbench_0.5-4.tar.gz
+Source15:      ftp://stat.ethz.ch/R-CRAN/src/contrib/nlme_3.1-23.tar.gz
+Source16:      ftp://stat.ethz.ch/R-CRAN/src/contrib/oz_1.0-6.tar.gz
+Source17:      ftp://stat.ethz.ch/R-CRAN/src/contrib/polynom_1.1-8.tar.gz
+Source18:      ftp://stat.ethz.ch/R-CRAN/src/contrib/princurve_1.1-3.tar.gz
+Source19:      ftp://stat.ethz.ch/R-CRAN/src/contrib/quadprog_1.4-4.tar.gz
+Source20:      ftp://stat.ethz.ch/R-CRAN/src/contrib/rpart_3.1-5.tar.gz
+Source21:      ftp://stat.ethz.ch/R-CRAN/src/contrib/survival_2.8-2.tar.gz
+Source22:      ftp://stat.ethz.ch/R-CRAN/src/contrib/xgobi_1.2-5.tar.gz
+Source23:      ftp://stat.ethz.ch/R-CRAN/src/contrib/Archive/integrate_2.2-3.tar.gz
+License:       Mixed (distributable), mostly GPL
 Group:         Development/Languages
 URL:           http://stat.auckland.ac.nz/r/r.html
 Provides:      R-base R-contrib
 BuildRequires: libstdc++-devel
 BuildRequires: gcc-c++
 BuildRequires: gcc-g77
-BuildRequires: perl >= 5
+BuildRequires: perl >= 5.004
 BuildRequires: libtool
 BuildRequires: tetex-latex
 BuildRequires: tetex-dvips
@@ -80,11 +81,9 @@ implementacja i semantyka wywodzi si
 Summary:       The R base distribution
 Summary(pl):   Podstawowa dystrybucja R
 Group:         Development/Languages
-Provides:      R-acepack R-bootstrap R-VR R-cluster R-ctest R-date R-e1071
-Provides:      R-fracdiff R-gee R-integrate R-jpn R-leaps R-mlbench R-oz
-Provides:      R-polynom R-princurve R-quadprog R-ratetables R-rational
-Provides:      R-splines R-survival R-xgobi
-Obsoletes:     R-principal.curve R-survival4 R-clus R-class R-nnet R-spatial
+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
+License:       GPL v2 / LGPL
 
 %description base
 R is a language and run-time environment for carrying out interactive
@@ -101,13 +100,37 @@ S opracowanym w AT&T Bell Laboratiories (a teraz Lucent Technologies),
 mimo to u¿ytkownicy S zauwa¿± zbli¿one ¶rodowisko, a du¿a czê¶æ
 oprogramowania w S bêdzie dzia³a³a bez zmian w R.
 
+%package recommended
+Summary:       Recommended contributed packages for the R language
+Summary(pl):   Zalecane dodatkowe pakiety do jêzyka R
+Group:         Development/Languages
+Provides:      R-KernSmooth R-VR R-boot R-cluster R-foreign R-mgcv R-nlme
+Provides:      R-rpart R-survival
+License:       GPL, free or free for non-commercial use
+URL:           http://www.ci.tuwien.ac.at/R/
+Requires:      R-base >= %{version}
+Obsoletes:     R-survival4 R-MASS R-clus R-class R-nnet R-spatial
+
+%description recommended
+Packages which extend the capabilities of the R base distribution and
+are distributed on the Comprehensive R Archive Network (CRAN).
+
+%description recommended -l pl
+Pakiety rozszerzaj±ce mo¿liwo¶ci podstawowej dystrybucji jêzyka R,
+dystrubuowane w archiwum CRAN (Comprehensive R Archive Network).
+
 %package contrib
 Summary:       Contributed packages for the R language
 Summary(pl):   Dodatkowe pakiety do jêzyka R
 Group:         Development/Languages
+Provides:      R-acepack R-bootstrap R-date R-e1071 R-fracdiff R-gee
+Provides:      R-integrate R-leaps R-oz R-polynom R-princurve R-quadprog
+Provides:      R-xgobi
 License:       Mixed
 URL:           http://www.ci.tuwien.ac.at/R/
 Requires:      R-base >= %{version}
+Requires:      R-VR
+Obsoletes:     R-principal.curve
 
 %description contrib
 Packages which extend the capabilities of the R base distribution and
@@ -132,11 +155,12 @@ machine learning methods.
 
 %description mlbench -l pl
 Ten podpakiet R zawiera zestaw rzeczywistych danych i funkcji do
-zrobienia sztucznych danych dzia³aj±cych jako test wydajno¶ci metod
+tworzenia sztucznych danych s³u¿±cych jako test wydajno¶ci metod
 uczenia maszyny.
 
 %prep
-%setup -q -c -n R-cran -T -b 2
+%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
@@ -144,21 +168,23 @@ uczenia maszyny.
 %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 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 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 1
-%patch0 -p0
-# %patch0 -p1
+#%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
 rm -f ./doc/keyword-test.orig ./etc/undoc/R-funs.orig ./etc/undoc/extrExamp.orig 
@@ -186,10 +212,6 @@ ${R_HOME}/bin/INSTALL ${pkg}
 done
 cd ${R_HOME}
 
-# Install mlbench
-#
-${R_HOME}/bin/INSTALL mlbench
-
 #Remove old template files.
 #
 for oldinfile in `find . -name '*.in' -print`
@@ -273,29 +295,53 @@ fi
 %attr(-,root,root) %{_libdir}/R/etc
 %attr(-,root,root) %{_libdir}/R/include
 %attr(-,root,root) %dir %{_libdir}/R/library
-%attr(-,root,root) %{_libdir}/R/library/base/
+%attr(-,root,root) %{_libdir}/R/library/base
 %attr(-,root,root) %{_libdir}/R/library/ctest
-%attr(-,root,root) %{_libdir}/R/library/eda/
-%attr(-,root,root) %{_libdir}/R/library/mva/
+%attr(-,root,root) %{_libdir}/R/library/eda
+%attr(-,root,root) %{_libdir}/R/library/lqs
+%attr(-,root,root) %{_libdir}/R/library/methods
+%attr(-,root,root) %{_libdir}/R/library/modreg
+%attr(-,root,root) %{_libdir}/R/library/mva
+%attr(-,root,root) %{_libdir}/R/library/nls
 %attr(-,root,root) %{_libdir}/R/library/splines
-%attr(-,root,root) %{_libdir}/R/library/stepfun/
+%attr(-,root,root) %{_libdir}/R/library/stepfun
+%attr(-,root,root) %{_libdir}/R/library/tcltk
+%attr(-,root,root) %{_libdir}/R/library/tools
+%attr(-,root,root) %{_libdir}/R/library/ts
 %attr(-,root,root) %{_libdir}/R/modules
 %attr(-,root,root) %doc CHANGES COPYING COPYRIGHTS MIRROR-SITES PROJECTS README RESOURCES TASKS
 %attr(-,root,root) %doc html
 
-%files contrib
+%files recommended
 %defattr(644,root,root,755)
 %attr(-,root,root) %{_libdir}/R/library/MASS
 %attr(-,root,root) %{_libdir}/R/library/class
-%attr(-,root,root) %{_libdir}/R/library/spatial
 %attr(-,root,root) %{_libdir}/R/library/nnet
+%attr(-,root,root) %{_libdir}/R/library/spatial
 %attr(-,root,root) %doc VR
+%attr(-,root,root) %{_libdir}/R/library/KernSmooth
+%attr(-,root,root) %doc KernSmooth
+%attr(-,root,root) %{_libdir}/R/library/boot
+%attr(-,root,root) %doc boot
+%attr(-,root,root) %{_libdir}/R/library/cluster
+%attr(-,root,root) %doc cluster
+%attr(-,root,root) %{_libdir}/R/library/foreign
+%attr(-,root,root) %doc foreign
+%attr(-,root,root) %{_libdir}/R/library/mgcv
+%attr(-,root,root) %doc mgcv
+%attr(-,root,root) %{_libdir}/R/library/nlme
+%attr(-,root,root) %doc nlme
+%attr(-,root,root) %{_libdir}/R/library/rpart
+%attr(-,root,root) %doc rpart
+%attr(-,root,root) %{_libdir}/R/library/survival
+%attr(-,root,root) %doc survival
+
+%files contrib
+%defattr(644,root,root,755)
 %attr(-,root,root) %{_libdir}/R/library/acepack
 %attr(-,root,root) %doc acepack
 %attr(-,root,root) %{_libdir}/R/library/bootstrap
 %attr(-,root,root) %doc bootstrap
-%attr(-,root,root) %{_libdir}/R/library/cluster
-%attr(-,root,root) %doc cluster
 %attr(-,root,root) %{_libdir}/R/library/date
 %attr(-,root,root) %doc date
 %attr(-,root,root) %{_libdir}/R/library/e1071
@@ -306,8 +352,6 @@ fi
 %attr(-,root,root) %doc gee
 %attr(-,root,root) %{_libdir}/R/library/integrate
 %attr(-,root,root) %doc integrate
-# %attr(-,root,root) %{_libdir}/R/library/jpn
-# %attr(-,root,root) %doc jpn
 %attr(-,root,root) %{_libdir}/R/library/leaps
 %attr(-,root,root) %doc leaps
 %attr(-,root,root) %{_libdir}/R/library/oz
@@ -318,18 +362,10 @@ fi
 %attr(-,root,root) %doc princurve
 %attr(-,root,root) %{_libdir}/R/library/quadprog
 %attr(-,root,root) %doc quadprog
-# %attr(-,root,root) %{_libdir}/R/library/ratetables
-# %attr(-,root,root) %doc ratetables
-# %attr(-,root,root) %{_libdir}/R/library/rational
-# %attr(-,root,root) %doc rational
-%attr(-,root,root) %{_libdir}/R/library/survival
-%attr(-,root,root) %doc survival
 %attr(-,root,root) %{_libdir}/R/library/xgobi
 %attr(-,root,root) %doc xgobi
 
 %files mlbench
 %defattr(644,root,root,755)
 %attr(-,root,root) %{_libdir}/R/library/mlbench
-%attr(-,root,root) %doc mlbench/COPYRIGHT
-%attr(-,root,root) %doc mlbench/ChangeLog
-%attr(-,root,root) %doc mlbench/README
+%attr(-,root,root) %doc mlbench