From 93f88a6307539106ff3b4cb6f540d9f1f919b163 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 25 Aug 2021 16:14:19 -0400 Subject: [PATCH] Fix return type in get_data_path patch. --- 0001-matplotlibrc-path-search-fix.patch | 10 +++++----- ...eType-version-to-2.10.4-and-update-tolerances.patch | 8 ++++---- python-matplotlib.spec | 5 ++++- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/0001-matplotlibrc-path-search-fix.patch b/0001-matplotlibrc-path-search-fix.patch index 3bfa1ae..272eebf 100644 --- a/0001-matplotlibrc-path-search-fix.patch +++ b/0001-matplotlibrc-path-search-fix.patch @@ -1,7 +1,7 @@ -From fc48d068c9e28cdd82e93db2248ff2fa6facc986 Mon Sep 17 00:00:00 2001 +From 60ab4094d885067c50694d2f11cd640dc5c0f0c6 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 27 Sep 2017 19:35:59 -0400 -Subject: [PATCH 1/3] matplotlibrc path search fix +Subject: [PATCH 1/2] matplotlibrc path search fix Signed-off-by: Elliott Sales de Andrade --- @@ -9,7 +9,7 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py -index 71c68a3d6b..9d795f65f5 100644 +index 71c68a3d6b..88be8e97b0 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -473,7 +473,8 @@ def get_cachedir(): @@ -17,8 +17,8 @@ index 71c68a3d6b..9d795f65f5 100644 def get_data_path(): """Return the path to Matplotlib data.""" - return str(Path(__file__).with_name("mpl-data")) -+ return (Path(__file__).parent.parent.parent.parent.parent / -+ 'share/matplotlib/mpl-data') ++ return str(Path(__file__).parent.parent.parent.parent.parent / ++ 'share/matplotlib/mpl-data') def matplotlib_fname(): diff --git a/0002-Set-FreeType-version-to-2.10.4-and-update-tolerances.patch b/0002-Set-FreeType-version-to-2.10.4-and-update-tolerances.patch index e30ef41..758ae48 100644 --- a/0002-Set-FreeType-version-to-2.10.4-and-update-tolerances.patch +++ b/0002-Set-FreeType-version-to-2.10.4-and-update-tolerances.patch @@ -1,7 +1,7 @@ -From 8e37877bc09957a50ee2f181b62447adb14d5162 Mon Sep 17 00:00:00 2001 +From 7ca8afa7fa3e141464c1ef2b2c58b23b586bf310 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 14 Feb 2020 06:05:42 -0500 -Subject: [PATCH 2/3] Set FreeType version to 2.11.0 and update tolerances. +Subject: [PATCH 2/2] Set FreeType version to 2.10.4 and update tolerances. Signed-off-by: Elliott Sales de Andrade --- @@ -15,7 +15,7 @@ Signed-off-by: Elliott Sales de Andrade 7 files changed, 23 insertions(+), 13 deletions(-) diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py -index 9d795f65f5..f01024109b 100644 +index 88be8e97b0..22dc74181e 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -1137,7 +1137,7 @@ default_test_modules = [ @@ -129,7 +129,7 @@ index 23d363b508..e94c863477 100644 diff --git a/setupext.py b/setupext.py -index d8d0b6b393..45cab7d036 100644 +index d8d0b6b393..e44d3b046a 100644 --- a/setupext.py +++ b/setupext.py @@ -167,12 +167,18 @@ _freetype_hashes = { diff --git a/python-matplotlib.spec b/python-matplotlib.spec index 9a4173b..3b2f7e7 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -49,7 +49,7 @@ Name: python-matplotlib Version: 3.4.3 %global Version 3.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python 2D plotting library # qt4_editor backend is MIT # ResizeObserver at end of lib/matplotlib/backends/web_backend/js/mpl.js is Public Domain @@ -463,6 +463,9 @@ PYTHONDONTWRITEBYTECODE=1 \ %changelog +* Wed Aug 25 2021 Elliott Sales de Andrade - 3.4.3-2 +- Fix return type in get_data_path patch + * Fri Aug 13 2021 Elliott Sales de Andrade - 3.4.3-1 - Update to latest version (#1993426)