From 52d9e04212eac82942b0d33393f3937f0c2c3314 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 2 Apr 2014 22:19:50 -0600 Subject: [PATCH] Rebuild for ntl 6.1.0. Fix ld ignoring __global_ldflags due to embedded trailing space. Fix Singular paths in the build environment. --- sagemath.spec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/sagemath.spec b/sagemath.spec index 8a1146e..84fe86b 100644 --- a/sagemath.spec +++ b/sagemath.spec @@ -62,7 +62,7 @@ Name: sagemath Group: Applications/Engineering Summary: A free open-source mathematics software system Version: 6.1.1 -Release: 4%{?dist} +Release: 5%{?dist} # The file ${SAGE_ROOT}/COPYING.txt is the upstream license breakdown file # Additionally, every $files section has a comment with the license name # before files with that license @@ -683,6 +683,11 @@ rm build/pkgs/sagenb/src/%{sagenb_pkg}/sagenb/data/sage3d/lib/sage3d.jar # remove binary egg rm -r build/pkgs/sagenb/src/%{sagenb_pkg}/sagenb.egg-info +# fix Singular paths +sed -e "s,SINGULARPATH=\",&%{_libdir}/Singular/LIB:," \ + -e "s,\(SINGULAR_EXECUTABLE=\"\).*\",\1%{_libdir}/Singular/Singular\"," \ + -i src/bin/sage-env + ######################################################################## %build export CC=%{__cc} @@ -712,10 +717,11 @@ export PYTHONPATH=%{buildroot}%{python_sitearch}:$PYTHONPATH pushd src/c_lib # scons ignores most environment variables # and does not have soname support + ldflags=$(sed 's/[[:blank:]]*$//' <<< "%{__global_ldflags}") sed -e 's|@@includedir@@|%{_includedir}|g' \ -e 's|@@libdir@@|%{_libdir}|g' \ -e 's|@@optflags@@|%{optflags}|g' \ - -e 's|@@__global_ldflags@@|%{__global_ldflags}|g' \ + -e "s|@@__global_ldflags@@|$ldflags|g" \ -i SConstruct CXX=g++ UNAME=Linux SAGE64=auto scons ln -s libcsage.so.0 libcsage.so @@ -1365,7 +1371,12 @@ exit 0 ######################################################################## %changelog -* Wed Mar 19 2014 Jerry James - 6.1.1-4 +* Wed Apr 2 2014 Jerry James - 6.1.1-5 +- Rebuild for ntl 6.1.0 +- Fix ld ignoring __global_ldflags due to embedded trailing space +- Fix Singular paths in the build environment + +* Wed Mar 19 2014 Jerry James - 6.1.1-4 - Rebuild for libgap 4.7.4 and cryptominisat 2.9.9 * Mon Mar 10 2014 Rex Dieter 6.1.1-3