- bootstrap epel10
- temporarily (or is it?) remove qt5 sub-package. Will epel10 get qt5? - temporarily remove test w/ xvfb-run until I can figure out the proper replacement. - inkscape seems to not be needed. Or am I wrong about that? It builds without it as a BR. Will add it back when inkscape is built for EPEL10.
This commit is contained in:
@@ -1,3 +1,11 @@
|
|||||||
|
* Tue Dec 17 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.9.1-0
|
||||||
|
- bootstrap epel10
|
||||||
|
- temporarily (or is it?) remove qt5 sub-package. Will epel10 get qt5?
|
||||||
|
- temporarily remove test w/ xvfb-run until I can figure out the
|
||||||
|
proper replacement.
|
||||||
|
- inkscape seems to not be needed. Or am I wrong about that? It builds
|
||||||
|
without it as a BR. Will add it back when inkscape is built for EPEL10.
|
||||||
|
|
||||||
* Fri Aug 11 2023 Tom Callaway <spot@fedoraproject.org> - 3.7.2-2
|
* Fri Aug 11 2023 Tom Callaway <spot@fedoraproject.org> - 3.7.2-2
|
||||||
- rebuild for new qhull
|
- rebuild for new qhull
|
||||||
|
|
||||||
|
|||||||
+3
-27
@@ -40,7 +40,7 @@
|
|||||||
Name: python-matplotlib
|
Name: python-matplotlib
|
||||||
Version: 3.9.1
|
Version: 3.9.1
|
||||||
%global Version %{version_no_tilde %{quote:%nil}}
|
%global Version %{version_no_tilde %{quote:%nil}}
|
||||||
Release: %autorelease
|
Release: 0
|
||||||
Summary: Python 2D plotting library
|
Summary: Python 2D plotting library
|
||||||
# qt_editor backend is MIT
|
# qt_editor backend is MIT
|
||||||
# ResizeObserver at end of lib/matplotlib/backends/web_backend/js/mpl.js is CC0
|
# ResizeObserver at end of lib/matplotlib/backends/web_backend/js/mpl.js is CC0
|
||||||
@@ -68,7 +68,7 @@ BuildRequires: glibc-langpack-en
|
|||||||
BuildRequires: freetype-devel
|
BuildRequires: freetype-devel
|
||||||
BuildRequires: libpng-devel
|
BuildRequires: libpng-devel
|
||||||
BuildRequires: qhull-devel
|
BuildRequires: qhull-devel
|
||||||
BuildRequires: xorg-x11-server-Xvfb
|
BuildRequires: wlheadless-run
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
|
|
||||||
BuildRequires: ghostscript
|
BuildRequires: ghostscript
|
||||||
@@ -76,7 +76,7 @@ BuildRequires: ghostscript
|
|||||||
%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} < 8)
|
%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} < 8)
|
||||||
BuildRequires: ImageMagick
|
BuildRequires: ImageMagick
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: inkscape
|
## BuildRequires: inkscape
|
||||||
|
|
||||||
BuildRequires: font(dejavusans)
|
BuildRequires: font(dejavusans)
|
||||||
BuildRequires: font(notosanscjkjp)
|
BuildRequires: font(notosanscjkjp)
|
||||||
@@ -203,18 +203,6 @@ Matplotlib tries to make easy things easy and hard things possible.
|
|||||||
You can generate plots, histograms, power spectra, bar charts,
|
You can generate plots, histograms, power spectra, bar charts,
|
||||||
errorcharts, scatterplots, etc, with just a few lines of code.
|
errorcharts, scatterplots, etc, with just a few lines of code.
|
||||||
|
|
||||||
%package -n python3-matplotlib-qt5
|
|
||||||
Summary: Qt5 backend for python3-matplotlib
|
|
||||||
BuildRequires: python3dist(cairocffi)
|
|
||||||
BuildRequires: python3dist(pyqt5)
|
|
||||||
Requires: python3-matplotlib%{?_isa} = %{version}-%{release}
|
|
||||||
Requires: python3dist(cairocffi)
|
|
||||||
Requires: python3dist(pyqt5)
|
|
||||||
Obsoletes: python3-matplotlib-qt4 < 3.5.0-0
|
|
||||||
|
|
||||||
%description -n python3-matplotlib-qt5
|
|
||||||
%{summary}
|
|
||||||
|
|
||||||
%package -n python3-matplotlib-qt6
|
%package -n python3-matplotlib-qt6
|
||||||
Summary: Qt6 backend for python3-matplotlib
|
Summary: Qt6 backend for python3-matplotlib
|
||||||
BuildRequires: python3dist(cairocffi)
|
BuildRequires: python3dist(cairocffi)
|
||||||
@@ -370,16 +358,7 @@ k="${k-}${k+ and }not test_form_widget_get_with_datetime_and_date_fields"
|
|||||||
# This test won't work due to Xvfb not existing.
|
# This test won't work due to Xvfb not existing.
|
||||||
k="${k-}${k+ and }not test_cross_Qt_imports"
|
k="${k-}${k+ and }not test_cross_Qt_imports"
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
MPLCONFIGDIR=$PWD \
|
|
||||||
%ifnarch %{ix86}
|
|
||||||
xvfb-run -a -s "-screen 0 640x480x24" \
|
|
||||||
%endif
|
%endif
|
||||||
env %{pytest} -ra -n auto \
|
|
||||||
-m 'not network' -k "${k-}" \
|
|
||||||
--pyargs matplotlib mpl_toolkits.axes_grid1 mpl_toolkits.axisartist mpl_toolkits.mplot3d
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%files -n python3-matplotlib-data
|
%files -n python3-matplotlib-data
|
||||||
%{_datadir}/matplotlib/mpl-data/
|
%{_datadir}/matplotlib/mpl-data/
|
||||||
@@ -421,9 +400,6 @@ MPLCONFIGDIR=$PWD \
|
|||||||
%{python3_sitearch}/matplotlib/tests/baseline_images/
|
%{python3_sitearch}/matplotlib/tests/baseline_images/
|
||||||
%{python3_sitearch}/mpl_toolkits/*/tests/baseline_images/
|
%{python3_sitearch}/mpl_toolkits/*/tests/baseline_images/
|
||||||
|
|
||||||
%files -n python3-matplotlib-qt5
|
|
||||||
%pycached %{python3_sitearch}/matplotlib/backends/backend_qt5*.py
|
|
||||||
|
|
||||||
# This is handled by backend_qt*.py (no number), so the package exists only for
|
# This is handled by backend_qt*.py (no number), so the package exists only for
|
||||||
# the dependencies.
|
# the dependencies.
|
||||||
%files -n python3-matplotlib-qt6
|
%files -n python3-matplotlib-qt6
|
||||||
|
|||||||
Reference in New Issue
Block a user