From 3c28ac74172c0fc563c3c7bca009b2fbee96771e Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Mon, 15 Aug 2016 11:15:38 -0400
Subject: [PATCH] 2.3.3 GA

---
 nfs-ganesha.spec | 37 ++++++++++++++++++++++++++++++++-----
 sources          |  2 +-
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index d7dafc0..aa8619d 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -38,6 +38,9 @@
 %bcond_without ceph
 %global use_fsal_ceph %{on_off_switch ceph}
 
+%bcond_with rgw
+%global use_fsal_rgw %{on_off_switch rgw}
+
 %bcond_with lustre
 %global use_fsal_lustre %{on_off_switch lustre}
 
@@ -79,7 +82,7 @@
 %global dev_version %{lua: extraver = string.gsub('', '%-', '.'); print(extraver) }
 
 Name:		nfs-ganesha
-Version:	2.3.2
+Version:	2.3.3
 Release:	1%{?dev_version:%{dev_version}}%{?dist}
 Summary:	NFS Server running in user space
 Group:		Applications/System
@@ -87,7 +90,6 @@ License:	LGPLv3+
 Url:		https://github.com/nfs-ganesha/nfs-ganesha/wiki
 
 Source0:	https://github.com/%{name}/%{name}/archive/V%{version}/%{name}-%{version}%{dev_version}.tar.gz
-Patch01:        nfs-ganesha-2.3.2-fix-unintialized-variable-crud.patch
 
 BuildRequires:	cmake
 BuildRequires:	bison
@@ -226,14 +228,26 @@ be used with NFS-Ganesha to support GPFS backend
 Summary: The NFS-GANESHA's CEPH FSAL
 Group: Applications/System
 Requires:	nfs-ganesha = %{version}-%{release}
-Requires:	ceph >= 0.78
-BuildRequires:	ceph-devel >= 0.78
+BuildRequires:	libcephfs1-devel >= 0.94
 
 %description ceph
 This package contains a FSAL shared object to
 be used with NFS-Ganesha to support CEPH
 %endif
 
+# RGW
+%if %{with rgw}
+%package rgw
+Summary: The NFS-GANESHA's Ceph RGW FSAL
+Group: Applications/System
+Requires:       nfs-ganesha = %{version}-%{release}
+BuildRequires:  librgw2-devel >= 10.2.0
+
+%description rgw
+This package contains a FSAL shared object to
+be used with NFS-Ganesha to support Ceph RGW
+%endif
+
 # LUSTRE
 %if %{with lustre}
 %package lustre
@@ -330,7 +344,6 @@ be used with NFS-Ganesha to support Gluster
 %prep
 %setup -q -n %{name}-%{version}%{dev_version}
 rm -rf contrib/libzfswrapper
-%patch01 -p1
 
 %build
 cd src && %cmake . -DCMAKE_BUILD_TYPE=Debug		\
@@ -339,6 +352,7 @@ cd src && %cmake . -DCMAKE_BUILD_TYPE=Debug		\
 	-DUSE_FSAL_ZFS=NO				\
 	-DUSE_FSAL_XFS=%{use_fsal_xfs}			\
 	-DUSE_FSAL_CEPH=%{use_fsal_ceph}		\
+	-DUSE_FSAL_RGW=%{use_fsal_rgw}			\
 	-DUSE_FSAL_LUSTRE=%{use_fsal_lustre}		\
 	-DUSE_FSAL_SHOOK=%{use_fsal_shook}		\
 	-DUSE_FSAL_GPFS=%{use_fsal_gpfs}		\
@@ -380,6 +394,9 @@ install -m 755 scripts/nfs-ganesha-config.sh %{buildroot}%{_libexecdir}/ganesha
 install -m 755 tools/mount.9P	%{buildroot}%{_sbindir}/mount.9P
 
 install -m 644 config_samples/vfs.conf %{buildroot}%{_sysconfdir}/ganesha
+%if %{with rgw}
+install -m 644 config_samples/rgw.conf %{buildroot}%{_sysconfdir}/ganesha
+%endif
 
 %if %{with_systemd}
 mkdir -p %{buildroot}%{_unitdir}
@@ -521,6 +538,13 @@ install -m 644 ChangeLog	%{buildroot}%{_defaultdocdir}/ganesha
 %config(noreplace) %{_sysconfdir}/ganesha/ceph.conf
 %endif
 
+%if %{with rgw}
+%files rgw
+%defattr(-,root,root,-)
+%{_libdir}/ganesha/libfsalrgw*
+%config(noreplace) %{_sysconfdir}/ganesha/rgw.conf
+%endif
+
 %if %{with lustre}
 %files lustre
 %config(noreplace) %{_sysconfdir}/ganesha/lustre.conf
@@ -581,6 +605,9 @@ install -m 644 ChangeLog	%{buildroot}%{_defaultdocdir}/ganesha
 %endif
 
 %changelog
+* Mon Aug 15 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.3.3-1
+- 2.3.3 GA
+
 * Mon May 02 2016 Jiffin Tony Thottan <jthottan at redhat.com> 2.3.2-1
 - 2.3.2 GA
 
diff --git a/sources b/sources
index f746c25..59e770c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-49c20596a1dda2bded30da18fc733f02  nfs-ganesha-2.3.2.tar.gz
+967210e9818c327eda800ae0c0a55514  nfs-ganesha-2.3.3.tar.gz