From bf71e9072346819a9aeece2e1058b714ede8663e Mon Sep 17 00:00:00 2001
From: Kaleb S KEITHLEY <kkeithle@redhat.com>
Date: Thu, 24 Dec 2020 08:19:55 -0500
Subject: [PATCH] NFS-Ganesha 3.4 GA

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

diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index 85b9a4c..e447b49 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -114,15 +114,13 @@ Requires: openSUSE-release
 # %%global	dev rc5
 
 Name:		nfs-ganesha
-Version:	3.3
-Release:	8%{?dev:%{dev}}%{?dist}
+Version:	3.4
+Release:	1%{?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
-Patch0001:	0001-systemd-revised-drop-in-conf-file-handling.patch
-Patch0002:	0002-selinux-ganesha.te.patch
 
 BuildRequires:	cmake
 BuildRequires:	make
@@ -157,7 +155,7 @@ BuildRequires: libwbclient-devel
 %endif
 BuildRequires:	gcc-c++
 %if ( %{with_system_ntirpc} )
-BuildRequires:	libntirpc-devel = 3.3
+BuildRequires:	libntirpc-devel = 3.4
 %else
 Requires: libntirpc = @NTIRPC_VERSION_EMBED@
 %endif
@@ -211,7 +209,8 @@ BuildRequires: python3-sphinx
 %endif
 %endif
 Requires(post): psmisc
-Requires(pre): shadow-utils
+Requires(pre): /usr/sbin/useradd
+Requires(pre): /usr/sbin/groupadd
 
 %if ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
 Requires: nfs-ganesha-selinux = %{version}-%{release}
@@ -262,12 +261,12 @@ BuildRequires:	python-devel
 Requires:	python3-gobject, python3-pyparsing
 BuildRequires:	python3-devel
 BuildRequires:	python3-setuptools
-%endif
 %if ( 0%{?suse_version} )
 Requires:	dbus-1-python
 %else
 Requires:	python3-dbus
 %endif
+%endif
 
 %if %{with gui_utils}
 %if ( 0%{?suse_version} )
@@ -362,6 +361,7 @@ be used with NFS-Ganesha to support GPFS backend
 Summary: The NFS-GANESHA CephFS FSAL
 Requires:	nfs-ganesha = %{version}-%{release}
 BuildRequires:	libcephfs2-devel >= 12.2.0
+BuildRequires:	libacl-devel
 
 %description ceph
 This package contains a FSAL shared object to
@@ -496,8 +496,6 @@ Development headers and auxiliary files for developing with %{name}.
 
 %prep
 %setup -q -n %{name}-%{version}%{?dev:-%{dev}}
-%patch0001 -p1
-%patch0002 -p1
 
 %build
 cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo	\
@@ -670,8 +668,6 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/ganesha
 %dir %{_sysconfdir}/ganesha/
 %config(noreplace) %{_sysconfdir}/ganesha/ganesha.conf
-%dir %{_defaultdocdir}/ganesha/
-%{_defaultdocdir}/ganesha/*
 %doc src/ChangeLog
 %dir %{_rundir}/ganesha
 %dir %{_libexecdir}/ganesha/
@@ -864,6 +860,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Dec 23 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.4-1
+- NFS-Ganesha 3.4 GA
+
 * Thu Nov 5 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.3-8
 - BuildRequires: make
 
diff --git a/sources b/sources
index 47f87c8..5af2183 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nfs-ganesha-3.3.tar.gz) = 35b5f0da26ba7a29738e7c80bb339d7643a1e06cb70e96c790a750a6d8d2ae76434f0e912e9bd00c9fcddb2916fdadc0c5f224069b1699cb4f90926231d64e71
+SHA512 (nfs-ganesha-3.4.tar.gz) = fe72d41cf9983824c78a622752e1ae608e14737868b9ab3528ffc019ff990c0336e226fe2a43de1757a694a470ddd47b4dc5580591c47d480f8472c72ee76058