diff --git a/SOURCES/0001.python.patch b/SOURCES/0001.python.patch new file mode 100644 index 0000000..5f0c11b --- /dev/null +++ b/SOURCES/0001.python.patch @@ -0,0 +1,63 @@ +--- nfs-ganesha-3.2/src/scripts/ganeshactl/ganeshactl.py.orig 2020-01-27 08:49:39.509216706 -0500 ++++ nfs-ganesha-3.2/src/scripts/ganeshactl/ganeshactl.py 2020-01-27 08:49:56.856565091 -0500 +@@ -26,7 +26,7 @@ + + import sys + +-from PyQt5 import QtCore, QtGui, QtDBus ++from PyQt4 import QtCore, QtGui, QtDBus + from Ganesha.QtUI.ui_main_window import Ui_MainWindow + from Ganesha.admin import AdminInterface + from Ganesha.export_mgr import ExportMgr +--- nfs-ganesha-3.2/src/scripts/ganeshactl/ganesha-admin.py.orig 2020-01-27 08:50:27.136173194 -0500 ++++ nfs-ganesha-3.2/src/scripts/ganeshactl/ganesha-admin.py 2020-01-27 08:51:13.152097329 -0500 +@@ -21,8 +21,8 @@ + #-*- coding: utf-8 -*- + from __future__ import print_function + import sys +-from PyQt5 import QtCore, QtDBus +-from PyQt5.QtGui import QApplication ++from PyQt4 import QtCore, QtDBus ++from PyQt4.QtGui import QApplication + from dbus.mainloop.qt import DBusQtMainLoop + from Ganesha.admin import AdminInterface + +--- nfs-ganesha-3.2/src/scripts/ganeshactl/manage_clients.py.orig 2020-01-27 08:50:38.529402003 -0500 ++++ nfs-ganesha-3.2/src/scripts/ganeshactl/manage_clients.py 2020-01-27 08:51:18.419203107 -0500 +@@ -22,8 +22,8 @@ + from __future__ import print_function + import sys + import time +-from PyQt5 import QtCore, QtDBus +-from PyQt5.QtGui import QApplication ++from PyQt4 import QtCore, QtDBus ++from PyQt4.QtGui import QApplication + from dbus.mainloop.qt import DBusQtMainLoop + from Ganesha.client_mgr import ClientMgr + +--- nfs-ganesha-3.2/src/scripts/ganeshactl/manage_exports.py.orig 2020-01-27 08:50:45.385539694 -0500 ++++ nfs-ganesha-3.2/src/scripts/ganeshactl/manage_exports.py 2020-01-27 08:51:40.319642933 -0500 +@@ -22,8 +22,8 @@ + from __future__ import print_function + import sys + import time +-from PyQt5 import QtCore, QtDBus +-from PyQt5.QtGui import QApplication ++from PyQt4 import QtCore, QtDBus ++from PyQt4.QtGui import QApplication + from dbus.mainloop.qt import DBusQtMainLoop + from Ganesha.export_mgr import ExportMgr + +--- nfs-ganesha-3.2/src/scripts/ganeshactl/manage_logger.py.orig 2020-01-27 08:50:55.832749505 -0500 ++++ nfs-ganesha-3.2/src/scripts/ganeshactl/manage_logger.py 2020-01-27 08:51:46.409765241 -0500 +@@ -21,8 +21,8 @@ + #-*- coding: utf-8 -*- + from __future__ import print_function + import sys +-from PyQt5 import QtCore, QtDBus +-from PyQt5.QtGui import QApplication ++from PyQt4 import QtCore, QtDBus ++from PyQt4.QtGui import QApplication + from dbus.mainloop.qt import DBusQtMainLoop + from Ganesha.log_mgr import LogManager + diff --git a/SPECS/nfs-ganesha.spec b/SPECS/nfs-ganesha.spec index c72de51..b978759 100644 --- a/SPECS/nfs-ganesha.spec +++ b/SPECS/nfs-ganesha.spec @@ -135,12 +135,13 @@ Requires: openSUSE-release Name: nfs-ganesha Version: 3.2 -Release: 2%{?dev:-%{dev}}%{?dist} +Release: 3%{?dev:-%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space License: LGPLv3+ Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki Source0: https://github.com/%{name}/%{name}/archive/V%{version}/%{name}-%{version}.tar.gz +Patch0001: 0001.python.patch BuildRequires: cmake BuildRequires: bison @@ -519,6 +520,7 @@ Development headers and auxiliary files for developing with %{name}. %prep %setup -q -n %{name}-%{version} +%patch0001 -p1 %build cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -898,6 +900,12 @@ exit 0 %endif %changelog +* Mon Jan 27 2020 Kaleb S. KEITHLEY - 3.2-3 +- nfs-ganesha 3.2, no PyQt5 + +* Tue Jan 14 2020 Kaleb S. KEITHLEY - 3.2-2 +- nfs-ganesha 3.2, python-dbus dependency + * Sun Dec 22 2019 Kaleb S. KEITHLEY - 3.2-1 - nfs-ganesha 3.2 GA - 3.1 was not built