PyQt4 -> PyQt5
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
This commit is contained in:
parent
a89e515064
commit
75adf590e8
|
@ -0,0 +1,22 @@
|
||||||
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||||
|
index cb10e10e4..a83873888 100644
|
||||||
|
--- a/src/CMakeLists.txt
|
||||||
|
+++ b/src/CMakeLists.txt
|
||||||
|
@@ -511,12 +511,15 @@ endif (USE_ADMIN_TOOLS)
|
||||||
|
gopt_test(USE_GUI_ADMIN_TOOLS)
|
||||||
|
if (USE_ADMIN_TOOLS)
|
||||||
|
if (USE_GUI_ADMIN_TOOLS)
|
||||||
|
- find_program(PYUIC NAMES pyuic4 DOC "PyQT UI-compiler executable")
|
||||||
|
+ find_program(PYUIC NAMES pyuic5 DOC "PyQT UI-compiler executable")
|
||||||
|
+ if (NOT PYUIC)
|
||||||
|
+ find_program(PYUIC NAMES pyuic4 DOC "PyQT UI-compiler executable")
|
||||||
|
+ endif (NOT PYUIC)
|
||||||
|
if (NOT PYUIC)
|
||||||
|
if (USE_GUI_ADMIN_TOOLS_REQUIRED)
|
||||||
|
message(FATAL_ERROR "Cannot find PyQt but GUI admin tools requested on command line")
|
||||||
|
else (USE_GUI_ADMIN_TOOLS_REQUIRED)
|
||||||
|
- message(WARNING "Cannot find PyQt4. Disabling GUI admin tools")
|
||||||
|
+ message(WARNING "Cannot find PyQt4 or PyQt5. Disabling GUI admin tools")
|
||||||
|
set(USE_GUI_ADMIN_TOOLS OFF)
|
||||||
|
endif (USE_GUI_ADMIN_TOOLS_REQUIRED)
|
||||||
|
endif (NOT PYUIC)
|
|
@ -131,13 +131,14 @@ Requires: openSUSE-release
|
||||||
|
|
||||||
Name: nfs-ganesha
|
Name: nfs-ganesha
|
||||||
Version: 2.8.2
|
Version: 2.8.2
|
||||||
Release: 3%{?dev:%{dev}}%{?dist}
|
Release: 4%{?dev:%{dev}}%{?dist}
|
||||||
Summary: NFS-Ganesha is a NFS Server running in user space
|
Summary: NFS-Ganesha is a NFS Server running in user space
|
||||||
License: LGPLv3+
|
License: LGPLv3+
|
||||||
Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki
|
Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki
|
||||||
|
|
||||||
Source0: https://github.com/%{name}/%{name}/archive/V%{version}/%{name}-%{version}.tar.gz
|
Source0: https://github.com/%{name}/%{name}/archive/V%{version}/%{name}-%{version}.tar.gz
|
||||||
Patch0001: 0001-src-scripts-gpfs-epoch.patch
|
Patch0001: 0001-src-scripts-gpfs-epoch.patch
|
||||||
|
Patch0002: 0002-src-CMakeLists.txt.patch
|
||||||
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
|
@ -286,9 +287,13 @@ BuildRequires: python2-devel
|
||||||
%if ( 0%{?suse_version} )
|
%if ( 0%{?suse_version} )
|
||||||
BuildRequires: python-qt4-devel
|
BuildRequires: python-qt4-devel
|
||||||
%else
|
%else
|
||||||
|
%if ( 0%{?fedora} >= 31 || 0%{?rhel} >= 8 )
|
||||||
|
BuildRequires: python3-PyQt5-devel
|
||||||
|
%else
|
||||||
BuildRequires: python3-PyQt4-devel
|
BuildRequires: python3-PyQt4-devel
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%description utils
|
%description utils
|
||||||
This package contains utility scripts for managing the NFS-GANESHA server
|
This package contains utility scripts for managing the NFS-GANESHA server
|
||||||
|
@ -494,6 +499,7 @@ Development headers and auxiliary files for developing with %{name}.
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}
|
%setup -q -n %{name}-%{version}
|
||||||
%patch0001 -p1
|
%patch0001 -p1
|
||||||
|
%patch0002 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||||
|
@ -869,6 +875,9 @@ exit 0
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Sep 25 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.8.2-4
|
||||||
|
- PyQt4 -> PyQt5
|
||||||
|
|
||||||
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.8.2-3
|
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.8.2-3
|
||||||
- Rebuilt for Python 3.8
|
- Rebuilt for Python 3.8
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue