From ffd451ce1c0c0ea4363efbd1e89aa635d8e80c7b Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 1 Jun 2016 14:25:36 -0400 Subject: [PATCH] more cleanups to libR.pc for zlibhack targets (el5/el6) --- R.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index 8f695a3..ed2975f 100644 --- a/R.spec +++ b/R.spec @@ -82,7 +82,7 @@ Name: R Version: 3.3.0 -Release: 3%{?dist} +Release: 4%{?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 @@ -675,6 +675,7 @@ cp -a %{SOURCE100} %{SOURCE101} %{SOURCE102} %{SOURCE103} %{SOURCE104} %{SOURCE1 # Clean our shameful shame out of the files. sed -i 's|-Wl,--whole-archive %{_builddir}/%{name}-%{version}/zlib-%{zlibv}/target%{_libdir}/libz.a %{_builddir}/%{name}-%{version}/bzip2-%{bzipv}/target%{_libdir}/libbz2.a %{_builddir}/%{name}-%{version}/xz-%{xzv}/target%{_libdir}/liblzma.a %{_builddir}/%{name}-%{version}/pcre-%{pcrev}/target%{_libdir}/libpcre.a %{_builddir}/%{name}-%{version}/curl-%{curlv}/target%{_libdir}/libcurl.a -Wl,--no-whole-archive -L%{_builddir}/%{name}-%{version}/curl-%{curlv}/target%{_libdir}/||g' %{buildroot}%{_libdir}/R/etc/Makeconf sed -i 's|-Wl,--whole-archive %{_builddir}/%{name}-%{version}/zlib-%{zlibv}/target%{_libdir}/libz.a %{_builddir}/%{name}-%{version}/bzip2-%{bzipv}/target%{_libdir}/libbz2.a %{_builddir}/%{name}-%{version}/xz-%{xzv}/target%{_libdir}/liblzma.a %{_builddir}/%{name}-%{version}/pcre-%{pcrev}/target%{_libdir}/libpcre.a %{_builddir}/%{name}-%{version}/curl-%{curlv}/target%{_libdir}/libcurl.a -Wl,--no-whole-archive -L%{_builddir}/%{name}-%{version}/curl-%{curlv}/target%{_libdir}/||g' %{buildroot}%{_libdir}/pkgconfig/libR.pc +sed -i 's|-ldl -lpthread -lc -lcurl -lidn -lssh2 -lssl -lcrypto -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -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 %endif @@ -1125,6 +1126,9 @@ R CMD javareconf \ %{_libdir}/libRmath.a %changelog +* Wed Jun 1 2016 Tom Callaway - 3.3.0-4 +- fixup libR.pc for zlibhack (el5/el6) + * Fri May 13 2016 Tom Callaway - 3.3.0-3 - we no longer need Requires: blas-devel, lapack-devel for R-core-devel