mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-10 23:18:51 -04:00
Fix upgrade conflicts due to the fix for bz 1875606.
This commit is contained in:
Jerry James
parent
861d3bcc88
commit
62eb3e50e9
1 changed files with 160 additions and 1 deletions
161
sagemath.spec
161
sagemath.spec
|
|
@ -94,7 +94,7 @@
|
|||
Name: sagemath
|
||||
Summary: A free open-source mathematics software system
|
||||
Version: 9.2
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?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
|
||||
|
|
@ -1567,6 +1567,93 @@ mkdir -p %{SAGE_LOCAL}/var/lib/sage/installed/database_cremona_ellcurve-%{cremon
|
|||
rm -fr %{SAGE_LOCAL}/var/lib/sage/installed/database_cremona_ellcurve-%{cremona_ver}
|
||||
|
||||
########################################################################
|
||||
# Fix directory/symlink conflicts introduced by fix for bz 1875606.
|
||||
# This can be removed when Fedora 36 reaches EOL.
|
||||
%pretrans doc-en -p <lua>
|
||||
paths = {
|
||||
"%{SAGE_DOC}/html/en/_static/config",
|
||||
"%{SAGE_DOC}/html/en/_static/extensions",
|
||||
"%{SAGE_DOC}/html/en/_static/fonts",
|
||||
"%{SAGE_DOC}/html/en/_static/jax",
|
||||
"%{SAGE_DOC}/html/en/_static/localization",
|
||||
"%{SAGE_DOC}/html/en/_static/test",
|
||||
"%{SAGE_DOC}/html/en/a_tour_of_sage/_static/config",
|
||||
"%{SAGE_DOC}/html/en/a_tour_of_sage/_static/extensions",
|
||||
"%{SAGE_DOC}/html/en/a_tour_of_sage/_static/fonts",
|
||||
"%{SAGE_DOC}/html/en/a_tour_of_sage/_static/jax",
|
||||
"%{SAGE_DOC}/html/en/a_tour_of_sage/_static/localization",
|
||||
"%{SAGE_DOC}/html/en/a_tour_of_sage/_static/test",
|
||||
"%{SAGE_DOC}/html/en/constructions/_static/config",
|
||||
"%{SAGE_DOC}/html/en/constructions/_static/extensions",
|
||||
"%{SAGE_DOC}/html/en/constructions/_static/fonts",
|
||||
"%{SAGE_DOC}/html/en/constructions/_static/jax",
|
||||
"%{SAGE_DOC}/html/en/constructions/_static/localization",
|
||||
"%{SAGE_DOC}/html/en/constructions/_static/test",
|
||||
"%{SAGE_DOC}/html/en/developer/_static/config",
|
||||
"%{SAGE_DOC}/html/en/developer/_static/extensions",
|
||||
"%{SAGE_DOC}/html/en/developer/_static/fonts",
|
||||
"%{SAGE_DOC}/html/en/developer/_static/jax",
|
||||
"%{SAGE_DOC}/html/en/developer/_static/localization",
|
||||
"%{SAGE_DOC}/html/en/developer/_static/test",
|
||||
"%{SAGE_DOC}/html/en/faq/_static/config",
|
||||
"%{SAGE_DOC}/html/en/faq/_static/extensions",
|
||||
"%{SAGE_DOC}/html/en/faq/_static/fonts",
|
||||
"%{SAGE_DOC}/html/en/faq/_static/jax",
|
||||
"%{SAGE_DOC}/html/en/faq/_static/localization",
|
||||
"%{SAGE_DOC}/html/en/faq/_static/test",
|
||||
"%{SAGE_DOC}/html/en/installation/_static/config",
|
||||
"%{SAGE_DOC}/html/en/installation/_static/extensions",
|
||||
"%{SAGE_DOC}/html/en/installation/_static/fonts",
|
||||
"%{SAGE_DOC}/html/en/installation/_static/jax",
|
||||
"%{SAGE_DOC}/html/en/installation/_static/localization",
|
||||
"%{SAGE_DOC}/html/en/installation/_static/test",
|
||||
"%{SAGE_DOC}/html/en/prep/_static/config",
|
||||
"%{SAGE_DOC}/html/en/prep/_static/extensions",
|
||||
"%{SAGE_DOC}/html/en/prep/_static/fonts",
|
||||
"%{SAGE_DOC}/html/en/prep/_static/jax",
|
||||
"%{SAGE_DOC}/html/en/prep/_static/localization",
|
||||
"%{SAGE_DOC}/html/en/prep/_static/test",
|
||||
"%{SAGE_DOC}/html/en/reference/_static/config",
|
||||
"%{SAGE_DOC}/html/en/reference/_static/extensions",
|
||||
"%{SAGE_DOC}/html/en/reference/_static/fonts",
|
||||
"%{SAGE_DOC}/html/en/reference/_static/jax",
|
||||
"%{SAGE_DOC}/html/en/reference/_static/localization",
|
||||
"%{SAGE_DOC}/html/en/reference/_static/test",
|
||||
"%{SAGE_DOC}/html/en/thematic_tutorials/_static/config",
|
||||
"%{SAGE_DOC}/html/en/thematic_tutorials/_static/extensions",
|
||||
"%{SAGE_DOC}/html/en/thematic_tutorials/_static/fonts",
|
||||
"%{SAGE_DOC}/html/en/thematic_tutorials/_static/jax",
|
||||
"%{SAGE_DOC}/html/en/thematic_tutorials/_static/localization",
|
||||
"%{SAGE_DOC}/html/en/thematic_tutorials/_static/test",
|
||||
"%{SAGE_DOC}/html/en/tutorial/_static/config",
|
||||
"%{SAGE_DOC}/html/en/tutorial/_static/extensions",
|
||||
"%{SAGE_DOC}/html/en/tutorial/_static/fonts",
|
||||
"%{SAGE_DOC}/html/en/tutorial/_static/jax",
|
||||
"%{SAGE_DOC}/html/en/tutorial/_static/localization",
|
||||
"%{SAGE_DOC}/html/en/tutorial/_static/test",
|
||||
"%{SAGE_DOC}/html/en/website/_static/config",
|
||||
"%{SAGE_DOC}/html/en/website/_static/extensions",
|
||||
"%{SAGE_DOC}/html/en/website/_static/fonts",
|
||||
"%{SAGE_DOC}/html/en/website/_static/jax",
|
||||
"%{SAGE_DOC}/html/en/website/_static/localization",
|
||||
"%{SAGE_DOC}/html/en/website/_static/test"
|
||||
}
|
||||
|
||||
for _, path in ipairs(paths) do
|
||||
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
|
||||
end
|
||||
|
||||
%files
|
||||
# GPLv2+
|
||||
%dir %{SAGE_ROOT}
|
||||
|
|
@ -1707,6 +1794,75 @@ rm -fr %{SAGE_LOCAL}/var/lib/sage/installed/database_cremona_ellcurve-%{cremona_
|
|||
%{SAGE_DOC}/en/
|
||||
%{SAGE_DOC}/html/en/
|
||||
|
||||
# Fix directory/symlink conflicts introduced by fix for bz 1875606.
|
||||
# This can be removed when Fedora 36 reaches EOL.
|
||||
%ghost %{SAGE_DOC}/html/en/_static/config.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/_static/extensions.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/_static/fonts.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/_static/jax.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/_static/localization.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/_static/test.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/a_tour_of_sage/_static/config.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/a_tour_of_sage/_static/extensions.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/a_tour_of_sage/_static/fonts.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/a_tour_of_sage/_static/jax.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/a_tour_of_sage/_static/localization.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/a_tour_of_sage/_static/test.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/constructions/_static/config.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/constructions/_static/extensions.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/constructions/_static/fonts.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/constructions/_static/jax.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/constructions/_static/localization.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/constructions/_static/test.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/developer/_static/config.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/developer/_static/extensions.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/developer/_static/fonts.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/developer/_static/jax.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/developer/_static/localization.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/developer/_static/test.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/faq/_static/config.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/faq/_static/extensions.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/faq/_static/fonts.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/faq/_static/jax.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/faq/_static/localization.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/faq/_static/test.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/installation/_static/config.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/installation/_static/extensions.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/installation/_static/fonts.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/installation/_static/jax.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/installation/_static/localization.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/installation/_static/test.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/prep/_static/config.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/prep/_static/extensions.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/prep/_static/fonts.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/prep/_static/jax.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/prep/_static/localization.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/prep/_static/test.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/reference/_static/config.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/reference/_static/extensions.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/reference/_static/fonts.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/reference/_static/jax.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/reference/_static/localization.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/reference/_static/test.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/thematic_tutorials/_static/config.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/thematic_tutorials/_static/extensions.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/thematic_tutorials/_static/fonts.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/thematic_tutorials/_static/jax.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/thematic_tutorials/_static/localization.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/thematic_tutorials/_static/test.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/tutorial/_static/config.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/tutorial/_static/extensions.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/tutorial/_static/fonts.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/tutorial/_static/jax.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/tutorial/_static/localization.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/tutorial/_static/test.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/website/_static/config.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/website/_static/extensions.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/website/_static/fonts.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/website/_static/jax.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/website/_static/localization.rpmmoved
|
||||
%ghost %{SAGE_DOC}/html/en/website/_static/test.rpmmoved
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
%files doc-fr
|
||||
# GPLv2+
|
||||
|
|
@ -1764,6 +1920,9 @@ rm -fr %{SAGE_LOCAL}/var/lib/sage/installed/database_cremona_ellcurve-%{cremona_
|
|||
|
||||
########################################################################
|
||||
%changelog
|
||||
* Tue Nov 17 2020 Jerry James <loganjerry@gmail.com> - 9.2-2
|
||||
- Fix upgrade conflicts due to the fix for bz 1875606
|
||||
|
||||
* Tue Nov 10 2020 Jerry James <loganjerry@gmail.com> - 9.2-1
|
||||
- Version 9.2 (bz 1891244)
|
||||
- Unbundle widgetsnbextension (bz 1856311)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue