- rel 3

- put back libR.so where R wants it and all programs expect it to be

Changed files:
    R.spec -> 1.160

diff --git a/R.spec b/R.spec
index 3857d4791505006700fa3ec9a853e1c222121ee7..db54efe499ce783a4b5ee4145c1bcc13a58fcde5 100644 (file)
--- a/R.spec
+++ b/R.spec
@@ -16,7 +16,7 @@ Summary:      A language for data analysis and graphics
 Summary(pl.UTF-8):     Język do analizy danych oraz grafiki
 Name:          R
 Version:       2.14.1
-Release:       2
+Release:       3
 License:       Mixed (distributable), mostly GPL v2+
 Group:         Development/Languages
 # CRAN master site: ftp://cran.r-project.org/pub/R/src/
@@ -133,7 +133,6 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_libdir}/R,%{_includedir
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
-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
 
@@ -179,8 +178,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc NEWS README doc/{AUTHORS,COPYRIGHTS,FAQ,RESOURCES,THANKS}
 %attr(755,root,root) %{_bindir}/R
 %attr(755,root,root) %{_bindir}/Rscript
-%attr(755,root,root) %{_libdir}/libR.so
 %dir %{_libdir}/R
+%dir %{_libdir}/R/lib
+%attr(755,root,root) %{_libdir}/R/lib/libR.so
 %{_libdir}/R/COPYING
 %{_libdir}/R/NEWS
 %{_libdir}/R/SVN-REVISION