From ebdd427a2da5fd006eb8b5cba483eeae6e07b509 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 7 Dec 2020 13:50:58 -0700 Subject: [PATCH] Try again to fix upgrade conflicts due to the fix for bz 1875606. --- sagemath.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sagemath.spec b/sagemath.spec index 28cc047..5d027be 100644 --- a/sagemath.spec +++ b/sagemath.spec @@ -94,7 +94,7 @@ Name: sagemath Summary: A free open-source mathematics software system Version: 9.2 -Release: 2%{?dist} +Release: 3%{?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 @@ -1569,7 +1569,7 @@ rm -fr %{SAGE_LOCAL}/var/lib/sage/installed/database_cremona_ellcurve-%{cremona_ ######################################################################## # Fix directory/symlink conflicts introduced by fix for bz 1875606. # This can be removed when Fedora 36 reaches EOL. -%pretrans -p +%pretrans -n sagemath-doc-en -p paths = { "%{SAGE_DOC}/html/en/_static/config", "%{SAGE_DOC}/html/en/_static/extensions", @@ -1920,6 +1920,9 @@ end ######################################################################## %changelog +* Mon Dec 7 2020 Jerry James - 9.2-3 +- Try again to fix upgrade conflicts due to the fix for bz 1875606 + * Tue Nov 17 2020 Jerry James - 9.2-2 - Fix upgrade conflicts due to the fix for bz 1875606