From f8c84153e7cd12c67cc6027c0f209dc4fcb205c0 Mon Sep 17 00:00:00 2001
From: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date: Nov 17 2021 15:26:26 +0000
Subject: nfs-ganesha 4.0 RC4


---

diff --git a/SOURCES/0002-CMakeLists.txt.patch b/SOURCES/0002-CMakeLists.txt.patch
new file mode 100644
index 0000000..16a4e10
--- /dev/null
+++ b/SOURCES/0002-CMakeLists.txt.patch
@@ -0,0 +1,78 @@
+--- nfs-ganesha-4-rc3/src/CMakeLists.txt.orig	2021-11-08 18:24:19.024041776 -0500
++++ nfs-ganesha-4-rc3/src/CMakeLists.txt	2021-11-09 13:54:02.553226811 -0500
+@@ -558,11 +558,11 @@
+ 
+ gopt_test(USE_ADMIN_TOOLS)
+ if (USE_ADMIN_TOOLS)
+-  find_package (Python COMPONENTS Interpreter Development)
+-  if (NOT Python_Interpreter_FOUND)
++  find_package(PythonInterp ${USE_ADMIN_TOOLS_REQUIRED})
++  if (NOT PYTHONINTERP_FOUND)
+     message(WARNING "Cannot find python. Disablin admin tools")
+     set(USE_ADMIN_TOOLS OFF)
+-  endif (NOT Python_Interpreter_FOUND)
++  endif (NOT PYTHONINTERP_FOUND)
+ endif (USE_ADMIN_TOOLS)
+ 
+ gopt_test(USE_GUI_ADMIN_TOOLS)
+--- nfs-ganesha-4-rc4/src/scripts/ganeshactl/CMakeLists.txt.orig	2021-11-17 09:22:20.860134361 -0500
++++ nfs-ganesha-4-rc4/src/scripts/ganeshactl/CMakeLists.txt	2021-11-17 09:41:47.651949504 -0500
+@@ -44,7 +44,7 @@
+   Ganesha/QtUI/ui_log_dialog.ui
+   )
+ 
+-if(Python_FOUND)
++if(PYTHONINTERP_FOUND)
+   set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in")
+   set(SETUP_PY    "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
+   set(OUTPUT      "${CMAKE_CURRENT_BINARY_DIR}/build/ganeshactl_timestamp")
+@@ -118,7 +118,7 @@
+ 
+   add_custom_command(
+     OUTPUT ${OUTPUT}
+-    COMMAND ${Python_EXECUTABLE} "${SETUP_PY}"  build
++    COMMAND ${PYTHON_EXECUTABLE} "${SETUP_PY}"  build
+     COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
+     DEPENDS ${GANESHA_SRCS} ${UI_PY_FILES} ${SCRIPTS}
+     )
+@@ -127,9 +127,9 @@
+ 
+   install(
+     CODE
+-    "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${Python_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})"
++    "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})"
+     )
+-endif(Python_FOUND)
++endif(PYTHONINTERP_FOUND)
+ 
+ # Man page
+ set(man8_file ganesha_conf.man)
+--- nfs-ganesha-4-rc4/src/scripts/gpfs-epoch/CMakeLists.txt.orig	2021-11-17 09:22:55.938555754 -0500
++++ nfs-ganesha-4-rc4/src/scripts/gpfs-epoch/CMakeLists.txt	2021-11-17 09:41:32.836208727 -0500
+@@ -1,6 +1,6 @@
+ 
+ if(USE_FSAL_GPFS)
+-  if(Python_FOUND)
++  if(PYTHONINTERP_FOUND)
+     set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in")
+     set(SETUP_PY    "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
+     set(OUTPUT      "${CMAKE_CURRENT_BINARY_DIR}/build/gpfs_epoch_timestamp")
+@@ -38,7 +38,7 @@
+     add_custom_command(
+       OUTPUT ${OUTPUT}
+       COMMAND ${CMAKE_COMMAND} -E touch __init__.py
+-      COMMAND ${Python_EXECUTABLE} "${SETUP_PY}"  build
++      COMMAND ${PYTHON_EXECUTABLE} "${SETUP_PY}"  build
+       COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
+       DEPENDS ${GPFS_EPOCH_SRCS} ${SCRIPTS}
+       )
+@@ -47,7 +47,7 @@
+ 
+     install(
+       CODE
+-      "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${Python_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} --install-scripts=\$ENV{DESTDIR}${LIBEXECDIR}/ganesha)"
++      "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} --install-scripts=\$ENV{DESTDIR}${LIBEXECDIR}/ganesha)"
+       )
+-  endif(Python_FOUND)
++  endif(PYTHONINTERP_FOUND)
+ endif(USE_FSAL_GPFS)
diff --git a/SPECS/nfs-ganesha.spec b/SPECS/nfs-ganesha.spec
index 4eca724..1367712 100644
--- a/SPECS/nfs-ganesha.spec
+++ b/SPECS/nfs-ganesha.spec
@@ -74,10 +74,10 @@ Requires: openSUSE-release
 %bcond_with lttng
 %global use_lttng %{on_off_switch lttng}
 
-%bcond_with utils
+%bcond_without utils
 %global use_utils %{on_off_switch utils}
 
-%bcond_with gui_utils
+%bcond_without gui_utils
 %global use_gui_utils %{on_off_switch gui_utils}
 
 %bcond_without system_ntirpc
@@ -118,12 +118,13 @@ Requires: openSUSE-release
 
 Name:		nfs-ganesha
 Version:	4.0
-Release:	0.1%{?dev:%{dev}}%{?dist}
+Release:	0.2%{?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}%{?dev:-%{dev}}/%{name}-%{version}%{?dev:%{dev}}.tar.gz
+Patch0002:	0002-CMakeLists.txt.patch
 
 BuildRequires:	cmake
 BuildRequires:	make
@@ -511,6 +512,7 @@ Development headers and auxiliary files for developing with %{name}.
 
 %prep
 %setup -q -n %{name}-4%{?dev:-%{dev}}
+%patch0002 -p1
 
 %build
 export VERBOSE=1
@@ -887,6 +889,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Nov 17 2021 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 4.0-0.2rc4
+- NFS-Ganesha 4.0 RC4
+
 * Fri Nov 12 2021 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 4.0-0.1rc3
 - NFS-Ganesha 4.0 RC3