From 0cbafc6f02e0c8786ac7f0e9ddbf3c06afce8894 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Thu, 3 Aug 2017 09:30:28 -0400
Subject: [PATCH] nfs-ganesha 2.5.1.1 GA enable ppc64, enable FSAL_GPFS

---
 nfs-ganesha.spec | 29 ++++++++---------------------
 sources          |  2 +-
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index 42d70cb..59a2f1b 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -46,24 +46,16 @@ Requires: openSUSE-release
 %bcond_with mem
 %global use_fsal_mem %{on_off_switch mem}
 
-%bcond_with gpfs
+%bcond_without gpfs
 %global use_fsal_gpfs %{on_off_switch gpfs}
 
 %bcond_without xfs
 %global use_fsal_xfs %{on_off_switch xfs}
 
-%ifnarch ppc64
 %bcond_without ceph
-%else
-%bcond_with ceph
-%endif
 %global use_fsal_ceph %{on_off_switch ceph}
 
-%ifnarch ppc64
 %bcond_without rgw
-%else
-%bcond_with rgw
-%endif
 %global use_fsal_rgw %{on_off_switch rgw}
 
 %bcond_without gluster
@@ -97,8 +89,8 @@ Requires: openSUSE-release
 # %%global	dash_dev_version 2.5-final
 
 Name:		nfs-ganesha
-Version:	2.5.1
-Release:	7%{?dev:%{dev}}%{?dist}
+Version:	2.5.1.1
+Release:	1%{?dev:%{dev}}%{?dist}
 Summary:	NFS-Ganesha is a NFS Server running in user space
 Group:		Applications/System
 License:	LGPLv3+
@@ -283,7 +275,6 @@ be used with NFS-Ganesha to support GPFS backend
 %endif
 
 # CEPH
-%ifnarch ppc64
 %if %{with ceph}
 %package ceph
 Summary: The NFS-GANESHA's CephFS FSAL
@@ -302,13 +293,12 @@ be used with NFS-Ganesha to support CephFS
 Summary: The NFS-GANESHA's Ceph RGW FSAL
 Group: Applications/System
 Requires:	nfs-ganesha = %{version}-%{release}
-BuildRequires:	librgw2-devel >= 10.2.7
+BuildRequires:	librgw-devel >= 12.1.1
 
 %description rgw
 This package contains a FSAL shared object to
 be used with NFS-Ganesha to support Ceph RGW
 %endif
-%endif
 
 # XFS
 %if %{with xfs}
@@ -400,9 +390,6 @@ 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}
@@ -425,7 +412,6 @@ install -m 644 scripts/init.d/sysconfig/ganesha		%{buildroot}%{_sysconfdir}/sysc
 install -m 644 config_samples/xfs.conf %{buildroot}%{_sysconfdir}/ganesha
 %endif
 
-%ifnarch ppc64
 %if %{with ceph}
 install -m 644 config_samples/ceph.conf %{buildroot}%{_sysconfdir}/ganesha
 %endif
@@ -434,7 +420,6 @@ install -m 644 config_samples/ceph.conf %{buildroot}%{_sysconfdir}/ganesha
 install -m 644 config_samples/rgw.conf %{buildroot}%{_sysconfdir}/ganesha
 install -m 644 config_samples/rgw_bucket.conf %{buildroot}%{_sysconfdir}/ganesha
 %endif
-%endif
 
 %if %{with gluster}
 install -m 644 config_samples/logrotate_fsal_gluster %{buildroot}%{_sysconfdir}/logrotate.d/ganesha-gfapi
@@ -592,7 +577,6 @@ exit 0
 %endif
 %endif
 
-%ifnarch ppc64
 %if %{with ceph}
 %files ceph
 %{_libdir}/ganesha/libfsalceph*
@@ -612,7 +596,6 @@ exit 0
 %{_mandir}/*/ganesha-rgw-config.8.gz
 %endif
 %endif
-%endif
 
 %if %{with gluster}
 %files gluster
@@ -663,6 +646,10 @@ exit 0
 %endif
 
 %changelog
+* Wed Aug 2 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.1.1-1
+- nfs-ganesha 2.5.1.1 GA
+- enable ppc64, enable FSAL_GPFS
+
 * Mon Jul 31 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.1-7
 - nfs-ganesha 2.5.1 w/ FSAL_CEPH and FSAL_RGW on i686, armv7hl
 
diff --git a/sources b/sources
index ee960ae..454c50d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nfs-ganesha-2.5.1.tar.gz) = f6c49da23e8fe9aa0db07119c98669872e75e83bac39dbbfeb057b36e4a681526869c1dd31b30a6c30b4dda75ab5bfde2cd218f2636e19062ef9175304ca55e4
+SHA512 (nfs-ganesha-2.5.1.1.tar.gz) = 433cbb718af0fdbeaab093a26ce4867bb7e6eb3d53525a30cba448625e66c9da9a93b558886d9d037f1b7a7eca483c226f77863f7f528591866eb38a1f1b8ad7