From 36f015d96d3d5727a11eefb35b7a7b668b810a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 12 May 2022 09:39:08 +0200 Subject: [PATCH 1/3] Add explicit dependency on PyQt5 (rhbz#2084297) --- PyMca.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/PyMca.spec b/PyMca.spec index 01c7e56..345df58 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -39,6 +39,9 @@ BuildRequires: qhull-devel BuildRequires: glibc-langpack-pl Requires: hicolor-icon-theme Requires: %{name}-data = %{version}-%{release} +# Dependency on the graphical toolkit is not autogenerated because many different +# ones are supported, https://bugzilla.redhat.com/show_bug.cgi?id=2084297. +Requires: PyQt5 %description PyMCA provides a graphical interface for multi-channel analyzer spectra From c9336a847f3baf6d22631cb0ab718288c19366ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 12 May 2022 09:56:59 +0200 Subject: [PATCH 2/3] Tweak requires R are now in the same form as BR. --- PyMca.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index 345df58..f573e5d 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -26,12 +26,12 @@ BuildRequires: desktop-file-utils BuildRequires: ImageMagick BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: %py3_dist cython -BuildRequires: %py3_dist numpy -BuildRequires: %py3_dist h5py -BuildRequires: %py3_dist pyqt5 -BuildRequires: %py3_dist fisx -BuildRequires: %py3_dist matplotlib +BuildRequires: python3dist(cython) +BuildRequires: python3dist(numpy) +BuildRequires: python3dist(h5py) +BuildRequires: python3dist(pyqt5) +BuildRequires: python3dist(fisx) +BuildRequires: python3dist(matplotlib) BuildRequires: python3-matplotlib-qt5 BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel @@ -41,7 +41,8 @@ Requires: hicolor-icon-theme Requires: %{name}-data = %{version}-%{release} # Dependency on the graphical toolkit is not autogenerated because many different # ones are supported, https://bugzilla.redhat.com/show_bug.cgi?id=2084297. -Requires: PyQt5 +BuildRequires: python3dist(pyqt5) +BuildRequires: python3-matplotlib-qt5 %description PyMCA provides a graphical interface for multi-channel analyzer spectra From 572aff7fcf07705bd17453ad15cac40741272e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 16 May 2022 13:25:18 +0200 Subject: [PATCH 3/3] Fix mixup between Requires and BuildRequires (#2084297) --- PyMca.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index f573e5d..87e47cf 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -41,8 +41,8 @@ Requires: hicolor-icon-theme Requires: %{name}-data = %{version}-%{release} # Dependency on the graphical toolkit is not autogenerated because many different # ones are supported, https://bugzilla.redhat.com/show_bug.cgi?id=2084297. -BuildRequires: python3dist(pyqt5) -BuildRequires: python3-matplotlib-qt5 +Requires: python3dist(pyqt5) +Requires: python3-matplotlib-qt5 %description PyMCA provides a graphical interface for multi-channel analyzer spectra