el6 merge

This commit is contained in:
Tom Callaway 2010-06-30 18:06:42 +00:00
parent 7120821ee5
commit dbc11a218b

33
R.spec
View File

@ -6,7 +6,7 @@
Name: R Name: R
Version: 2.11.1 Version: 2.11.1
Release: 1%{?dist} Release: 3%{?dist}
Summary: A language for data analysis and graphics Summary: A language for data analysis and graphics
URL: http://www.r-project.org URL: http://www.r-project.org
Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz 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 %description -n libRmath
A standalone library of mathematical and statistical functions derived 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 %package -n libRmath-devel
Summary: Standalone math library from the R project Summary: Headers from the R Standalone math library
Group: Development/Libraries Group: Development/Libraries
Requires: libRmath = %{version}-%{release}, pkgconfig Requires: libRmath = %{version}-%{release}, pkgconfig
%description -n libRmath-devel %description -n libRmath-devel
A standalone library of mathematical and statistical functions derived A standalone library of mathematical and statistical functions derived
from the R project. This packages provides the static libRmath library from the R project. This package provides the libRmath header files.
and 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 %prep
%setup -q %setup -q
@ -185,8 +193,8 @@ EOF
chmod +x %{__perl_requires} chmod +x %{__perl_requires}
%build %build
# Add PATHS to Renviron for R_LIBS # Add PATHS to Renviron for R_LIBS_SITE
echo 'R_LIBS=${R_LIBS-'"'%{_libdir}/R/library:%{_datadir}/R/library'"'}' >> etc/Renviron.in 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_PDFVIEWER="%{_bindir}/xdg-open"
export R_PRINTCMD="lpr" export R_PRINTCMD="lpr"
@ -820,10 +828,13 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
%files -n libRmath-devel %files -n libRmath-devel
%defattr(-, root, root, -) %defattr(-, root, root, -)
%{_libdir}/libRmath.a
%{_includedir}/Rmath.h %{_includedir}/Rmath.h
%{_libdir}/pkgconfig/libRmath.pc %{_libdir}/pkgconfig/libRmath.pc
%files -n libRmath-static
%defattr(-, root, root, -)
%{_libdir}/libRmath.a
%clean %clean
rm -rf ${RPM_BUILD_ROOT}; rm -rf ${RPM_BUILD_ROOT};
@ -897,6 +908,12 @@ R CMD javareconf \
%postun -n libRmath -p /sbin/ldconfig %postun -n libRmath -p /sbin/ldconfig
%changelog %changelog
* Wed Jun 30 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 2.11.1-3
- move libRmath static lib into libRmath-static subpackage
* Thu Jun 3 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 2.11.1-2
- overload R_LIBS_SITE instead of R_LIBS
* Tue Jun 1 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 2.11.1-1 * Tue Jun 1 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 2.11.1-1
- update to 2.11.1 - update to 2.11.1