From 1d83b2029074cd9796d90051d7c3faa447fe14b9 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sat, 11 Jun 2016 15:27:46 -0400 Subject: [PATCH 1/2] fix CAPABILITIES pathing --- R.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R.spec b/R.spec index 77632dc..f2d2b59 100644 --- a/R.spec +++ b/R.spec @@ -679,7 +679,7 @@ sed -i 's|-ldl -lpthread .* -lldap -lz -lrt||g' %{buildroot}%{_libdir}/R/etc/Mak sed -i 's|-ldl -lpthread .* -lldap -lz -lrt||g' %{buildroot}%{_libdir}/pkgconfig/libR.pc sed -i 's|-I%{_builddir}/%{name}-%{version}/zlib-%{zlibv}/target%{_includedir} -I%{_builddir}/%{name}-%{version}/bzip2-%{bzipv}/target%{_includedir} -I%{_builddir}/%{name}-%{version}/xz-%{xzv}/target%{_includedir} -I%{_builddir}/%{name}-%{version}/pcre-%{pcrev}/target%{_includedir} -I%{_builddir}/%{name}-%{version}/curl-%{curlv}/target%{_includedir}||g' %{buildroot}%{_libdir}/R/etc/Makeconf sed -i 's|-I%{_builddir}/%{name}-%{version}/zlib-%{zlibv}/target%{_includedir} -I%{_builddir}/%{name}-%{version}/bzip2-%{bzipv}/target%{_includedir} -I%{_builddir}/%{name}-%{version}/xz-%{xzv}/target%{_includedir} -I%{_builddir}/%{name}-%{version}/pcre-%{pcrev}/target%{_includedir} -I%{_builddir}/%{name}-%{version}/curl-%{curlv}/target%{_includedir}||g' %{buildroot}%{_libdir}/R/bin/libtool -sed -i 's|-I%{_builddir}/%{name}-%{version}/zlib-%{zlibv}/target%{_includedir} -I%{_builddir}/%{name}-%{version}/bzip2-%{bzipv}/target%{_includedir} -I%{_builddir}/%{name}-%{version}/xz-%{xzv}/target%{_includedir} -I%{_builddir}/%{name}-%{version}/pcre-%{pcrev}/target%{_includedir} -I%{_builddir}/%{name}-%{version}/curl-%{curlv}/target%{_includedir}||g' %{builddir}%{_datadir}/doc/R-%{version}/CAPABILITIES +sed -i 's|-I%{_builddir}/%{name}-%{version}/zlib-%{zlibv}/target%{_includedir} -I%{_builddir}/%{name}-%{version}/bzip2-%{bzipv}/target%{_includedir} -I%{_builddir}/%{name}-%{version}/xz-%{xzv}/target%{_includedir} -I%{_builddir}/%{name}-%{version}/pcre-%{pcrev}/target%{_includedir} -I%{_builddir}/%{name}-%{version}/curl-%{curlv}/target%{_includedir}||g' ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/CAPABILITIES #el6 FLIBS sed -i 's|-ldl -lpthread .* -lldap -lz||g' %{buildroot}%{_libdir}/R/etc/Makeconf #el5 FLIBS From 3dbb6edfe5c1efc06c649e3b88d47ce74f58d289 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sat, 11 Jun 2016 15:28:29 -0400 Subject: [PATCH 2/2] fix CAPABILITIES pathing --- R.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index f2d2b59..e4a75a1 100644 --- a/R.spec +++ b/R.spec @@ -82,7 +82,7 @@ Name: R Version: 3.3.0 -Release: 9%{?dist} +Release: 10%{?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-3/R-%{version}.tar.gz @@ -1136,6 +1136,9 @@ R CMD javareconf \ %{_libdir}/libRmath.a %changelog +* Sat Jun 11 2016 Tom Callaway - 3.3.0-10 +- fix CAPABILITIES pathing + * Sat Jun 11 2016 Tom Callaway - 3.3.0-9 - fix ldpaths for zlibhack - clean libtool