- kill yet another builddir, use %{_bindir}/R as symlink to %{_libdir}/R/bin/R

- release 4

Changed files:
    R.spec -> 1.54

diff --git a/R.spec b/R.spec
index 7656f6568c983ae1374173cc3e80044a5cd0a396..2c7fae5947700580eda15e82596d7617c1127be5 100644 (file)
--- a/R.spec
+++ b/R.spec
@@ -10,7 +10,7 @@ Summary:      A language for data analysis and graphics
 Summary(pl):   Jêzyk do analizy danych oraz grafiki
 Name:          R
 Version:       1.9.1
-Release:       3
+Release:       4
 License:       Mixed (distributable), mostly GPL
 Group:         Development/Languages
 # CRAN master site: ftp://cran.r-project.org/pub/R/src/
@@ -300,11 +300,11 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_libdir}/R,%{_includedir
 install %{SOURCE26} $RPM_BUILD_ROOT%{_desktopdir}
 
 cp doc/R.1 $RPM_BUILD_ROOT%{_mandir}/man1/
-sed "s,`pwd`,%{_libdir}/R,g" < bin/R > $RPM_BUILD_ROOT%{_bindir}/R
-
 
 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
 
 find $RPM_BUILD_ROOT%{_libdir}/R -name 'Makefile*' -exec rm -f {} \;
 rm -rf $RPM_BUILD_ROOT%{_libdir}/R/etc/*.old