rpms/R/EL-5 R.spec,1.45,1.46
Tom Callaway
spot at fedoraproject.org
Wed Jun 30 18:05:47 UTC 2010
Author: spot
Update of /cvs/pkgs/rpms/R/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24708/EL-5
Modified Files:
R.spec
Log Message:
fix static lib bug, overload R_LIBS_SITE instead of R_LIBS
Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/EL-5/R.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- R.spec 1 Jun 2010 18:57:13 -0000 1.45
+++ R.spec 30 Jun 2010 18:05:47 -0000 1.46
@@ -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
@@ -112,13 +112,9 @@ Obsoletes: R-Matrix-devel < 0.999375-7
%description devel
Install R-devel if you are going to develop or compile R packages.
-%package -n libRmath
-Summary: Standalone math library from the R project
-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
@@ -127,8 +123,16 @@ Requires: libRmath = %{version}-%{releas
%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
@@ -152,8 +156,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"
@@ -780,10 +784,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};
@@ -837,6 +844,12 @@ fi
%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
More information about the scm-commits
mailing list