- more specific R

- pre install script to adopt to new includes location

Changed files:
    R.spec -> 1.52

diff --git a/R.spec b/R.spec
index 36edad193a5b592e067a2c023a74509377f7d5d4..91e9a9a046206541a2b3982baab94778e8a296a6 100644 (file)
--- a/R.spec
+++ b/R.spec
@@ -147,7 +147,7 @@ URL:                http://www.ci.tuwien.ac.at/R/
 Requires(post,postun): R-base
 Requires(post,postun): textutils
 Requires(post,postun): perl
-Requires:      R-base >= %{version}
+Requires:      R-base = %{version}-%{release}
 Obsoletes:     R-survival4 R-MASS R-clus R-class R-nnet R-spatial
 
 %description recommended
@@ -167,7 +167,7 @@ URL:                http://www.ci.tuwien.ac.at/R/
 Requires(post,postun): R-base
 Requires(post,postun): textutils
 Requires(post,postun): perl
-Requires:      R-base >= %{version}
+Requires:      R-base = %{version}-%{release}
 Requires:      R-VR
 Provides:      R-acepack R-bootstrap R-date R-e1071 R-fracdiff R-gee
 Provides:      R-leaps R-oz R-polynom R-princurve R-quadprog
@@ -191,7 +191,7 @@ URL:                http://www.ics.uci.edu/~mlearn/MLRepository.html
 Requires(post,postun): R-base
 Requires(post,postun): textutils
 Requires(post,postun): perl
-Requires:      R-base >= %{version}
+Requires:      R-base = %{version}-%{release}
 
 %description mlbench
 R package which contains a collection of real-world datasets and
@@ -317,6 +317,12 @@ ln -sf %{_includedir}/R $RPM_BUILD_ROOT%{_libdir}/R/include
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre base
+if [ -d %{_libdir}/R/include -a ! -L %{_libdir}/R/include ]; then
+       mv %{_libdir}/R/include %{_includedir}/R
+       ln -sf %{_includedir}/R %{_libdir}/R/include
+fi
+
 %post base
 (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)