diff --git a/sagemath.spec b/sagemath.spec index 65f31c7..fe6ce3d 100644 --- a/sagemath.spec +++ b/sagemath.spec @@ -59,7 +59,7 @@ Name: sagemath Group: Applications/Engineering Summary: A free open-source mathematics software system Version: 7.3 -Release: 6%{?dist} +Release: 7%{?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 @@ -1311,10 +1311,29 @@ EOF chmod +x %{buildroot}%{SAGE_LOCAL}/bin/sage-list-packages #------------------------------------------------------------------------ +# do not install symlink to '.' +rm %{buildroot}%{SAGE_DOC}/output + # last install command rm -fr $DOT_SAGE ######################################################################## +%pretrans -p /usr/bin/lua +posix = require('posix') +path = "%{python_sitearch}/sagenb/data/mathjax" +st = posix.stat(path) +if st and st.type == "directory" then + status = os.rename(path, path .. ".rpmmoved") + if not status then + suffix = 0 + while not status do + suffix = suffix + 1 + status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix) + end + os.rename(path, path .. ".rpmmoved") + end +end + %post core /sbin/ldconfig exit 0 @@ -1323,6 +1342,21 @@ exit 0 /sbin/ldconfig exit 0 +# Upgrade correction for change from directory to symlink +%post doc +if [ ! -e %{SAGE_DOC}/common ]; then + ln -sf . %{SAGE_DOC}/common +fi +exit 0 + +%preun doc +if [ $1 -eq 0 ] ; then + if [ -h %{SAGE_DOC}/common ]; then + rm %{SAGE_DOC}/common + fi +fi +exit 0 + %post sagetex %{_bindir}/mktexlsr exit 0 @@ -1423,7 +1457,6 @@ exit 0 # GPLv2+ %dir %{SAGE_DOC} %{SAGE_DOC}/common -%{SAGE_DOC}/output %dir %{SAGE_DOC}/html #------------------------------------------------------------------------ @@ -1507,6 +1540,7 @@ exit 0 %{python_sitearch}/sagenb/data/json # Symbolic link to $_jsdir/mathjax %{python_sitearch}/sagenb/data/mathjax +%ghost %{python_sitearch}/sagenb/data/mathjax.rpmmoved # Empty (do not run doctests flag file) %{python_sitearch}/sagenb/data/nodoctest.py* # BSD @@ -1571,6 +1605,9 @@ exit 0 ######################################################################## %changelog +* Tue Dec 20 2016 pcpa - 7.3.7 +- Correct f24 to f25 upgrade, sagemath 6.8 to 7.3 (#1396848) + * Thu Oct 20 2016 Jerry James - 7.3-6 - Rebuild for ntl 10.1.0