From 66fd3679e7bea6ca186e21f4526c5b7a9efc7a34 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Wed, 17 Nov 2021 07:48:06 -0500
Subject: [PATCH] NFS-Ganesha 4.0 RC4

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
---
 nfs-ganesha.spec | 16 ++++++----------
 sources          |  1 +
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index 74f26a0..64ec03c 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -60,9 +60,6 @@ Requires: openSUSE-release
 %bcond_with kvsfs
 %global use_fsal_kvsfs %{on_off_switch kvsfs}
 
-%bcond_with proxy_v3
-%global use_proxy_v3 %{on_off_switch proxy_v3}
-
 %bcond_with rdma
 %global use_rdma %{on_off_switch rdma}
 
@@ -114,11 +111,11 @@ Requires: openSUSE-release
 %endif
 
 %global dev_version %{lua: s = string.gsub('@GANESHA_EXTRA_VERSION@', '^%-', ''); s2 = string.gsub(s, '%-', '.'); print((s2 ~= nil and s2 ~= '') and s2 or "0.1") }
-%global dev rc3
+%global dev rc4
 
 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
@@ -258,7 +255,6 @@ Requires: nfs-ganesha = %{version}-%{release}
 This package contains a FSAL shared object to
 be used with NFS-Ganesha to support PROXY_V4 based filesystems
 
-%if %{with proxy_v3}
 %package proxy-v3
 Summary: The NFS-GANESHA PROXY_V3 FSAL
 BuildRequires: libattr-devel
@@ -267,7 +263,6 @@ Requires: nfs-ganesha = %{version}-%{release}
 %description proxy-v3
 This package contains a FSAL shared object to
 be used with NFS-Ganesha to support PROXY_V3 based filesystems
-%endif
 
 %if %{with utils}
 %package utils
@@ -542,7 +537,7 @@ cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo	\
 	-DRADOS_URLS=%{use_rados_urls}			\
 	-DUSE_FSAL_VFS=ON				\
 	-DUSE_FSAL_PROXY_V4=ON				\
-	-DUSE_FSAL_PROXY_V3=OFF				\
+	-DUSE_FSAL_PROXY_V3=ON				\
 	-DUSE_DBUS=ON					\
 	-DUSE_9P=%{use_9P}				\
 	-DDISTNAME_HAS_GIT_DATA=OFF			\
@@ -750,13 +745,11 @@ exit 0
 %{_mandir}/*/ganesha-proxy-v4-config.8.gz
 %endif
 
-%if %{with proxy_v3}
 %files proxy-v3
 %{_libdir}/ganesha/libfsalproxy_v3*
 %if %{with man_page}
 %{_mandir}/*/ganesha-proxy-v3-config.8.gz
 %endif
-%endif
 
 # Optional packages
 %if %{with lustre}
@@ -895,6 +888,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
+
 * Mon Nov 8 2021 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 4.0-0.1rc3
 - NFS-Ganesha 4.0 RC3
 
diff --git a/sources b/sources
index c104ff8..0cd7099 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (nfs-ganesha-4.0rc3.tar.gz) = 318cfecb0bc58bc76849c915e0bd714133318a54ad62d969fd8d282d191fff0fcf9d5233c1749044035d9a2e97ec124aae7a39935fda243d3b21d4d6fb8de0cf
+SHA512 (nfs-ganesha-4.0rc4.tar.gz) = 25fb9ac0368a57a0db42c8d949c53e86d309107df018a18e47e1b950945f4e3b9654e8aefb6bc24d9a9e8df55244e4979eee1047322d82e2300b9bc573157c3e