rpms/R/EL-6 R.spec,1.70,1.71

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/R/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24822/EL-6

Modified Files:
	R.spec 
Log Message:
el6 merge


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/EL-6/R.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- R.spec	21 Jun 2010 17:45:25 -0000	1.70
+++ R.spec	30 Jun 2010 18:06:42 -0000	1.71
@@ -6,7 +6,7 @@
 
 Name: R
 Version: 2.11.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -151,17 +151,25 @@ Group: Development/Libraries
 
 %description -n libRmath
 A standalone library of mathematical and statistical functions derived
-from the R project.  This packages provides the shared libRmath library.
+from the R project.  This package provides the shared libRmath library.
 
 %package -n libRmath-devel
-Summary: Standalone math library from the R project
+Summary: Headers from the R Standalone math library
 Group: Development/Libraries
 Requires: libRmath = %{version}-%{release}, pkgconfig
 
 %description -n libRmath-devel
 A standalone library of mathematical and statistical functions derived
-from the R project.  This packages provides the static libRmath library
-and header files.
+from the R project.  This package provides the libRmath header files.
+
+%package -n libRmath-static
+Summary: Static R Standalone math library
+Group: Development/Libraries
+Requires: libRmath-devel = %{version}-%{release}
+
+%description -n libRmath-static
+A standalone library of mathematical and statistical functions derived
+from the R project.  This package provides the static libRmath library.
 
 %prep
 %setup -q
@@ -185,8 +193,8 @@ EOF
 chmod +x %{__perl_requires}
 
 %build
-# Add PATHS to Renviron for R_LIBS
-echo 'R_LIBS=${R_LIBS-'"'%{_libdir}/R/library:%{_datadir}/R/library'"'}' >> etc/Renviron.in
+# Add PATHS to Renviron for R_LIBS_SITE
+echo 'R_LIBS_SITE=${R_LIBS_SITE-'"'/usr/local/lib/R/site-library:/usr/local/lib/R/library:%{_libdir}/R/library:%{_datadir}/R/library'"'}' >> etc/Renviron.in
 
 export R_PDFVIEWER="%{_bindir}/xdg-open"
 export R_PRINTCMD="lpr"
@@ -820,10 +828,13 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/lib
 
 %files -n libRmath-devel
 %defattr(-, root, root, -)
-%{_libdir}/libRmath.a
 %{_includedir}/Rmath.h
 %{_libdir}/pkgconfig/libRmath.pc
 
+%files -n libRmath-static
+%defattr(-, root, root, -)
+%{_libdir}/libRmath.a
+
 %clean
 rm -rf ${RPM_BUILD_ROOT};
 
@@ -897,6 +908,12 @@ R CMD javareconf \
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Wed Jun 30 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.11.1-3
+- move libRmath static lib into libRmath-static subpackage
+
+* Thu Jun  3 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.11.1-2
+- overload R_LIBS_SITE instead of R_LIBS
+
 * Tue Jun  1 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.11.1-1
 - update to 2.11.1