From e796917a2d2c269f0fe3303ca0336f9627df7e32 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Tue, 17 Jul 2018 11:58:24 -0400
Subject: [PATCH] disable utils, python

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
---
 nfs-ganesha.spec | 263 ++++++++++++++++++++++++-----------------------
 xattr.patch      |  29 ++++++
 2 files changed, 163 insertions(+), 129 deletions(-)
 create mode 100644 xattr.patch

diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index 20c28e3..bb0d1e4 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -72,10 +72,10 @@ Requires: openSUSE-release
 %bcond_with lttng
 %global use_lttng %{on_off_switch lttng}
 
-%bcond_without utils
+%bcond_with utils
 %global use_utils %{on_off_switch utils}
 
-%bcond_without gui_utils
+%bcond_with gui_utils
 %global use_gui_utils %{on_off_switch gui_utils}
 
 %bcond_without system_ntirpc
@@ -100,13 +100,14 @@ Requires: openSUSE-release
 
 Name:		nfs-ganesha
 Version:	2.6.2
-Release:	3%{?dev:%{dev}}%{?dist}
+Release:	4%{?dev:%{dev}}%{?dist}
 Summary:	NFS-Ganesha is a NFS Server running in user space
 Group:		Applications/System
 License:	LGPLv3+
 Url:		https://github.com/nfs-ganesha/nfs-ganesha/wiki
 
 Source0:	https://github.com/%{name}/%{name}/archive/V%{version}/%{name}-%{version}.tar.gz
+Patch0:		xattr.patch
 
 BuildRequires:	cmake
 BuildRequires:	bison
@@ -406,6 +407,7 @@ Development headers and auxiliary files for developing with %{name}.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo	\
@@ -726,290 +728,293 @@ exit 0
 %endif
 
 %changelog
+* Tue Jul 17 2018 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.6.2-4
+- disable utils, python
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Tue Jul 3 2018 Kaleb S. KEITHLEY <kkeithle at redhat.com> 
 - defattr
 
-* Wed May 16 2018 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.6.2-2
+* Wed May 16 2018 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.6.2-2
 - nfs-ganesha 2.6.2 w/ ceph and rgw FSALs
 
-* Thu May 10 2018 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.6.2-1
+* Thu May 10 2018 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.6.2-1
 - nfs-ganesha 2.6.2 GA
 
-* Tue Mar 20 2018 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.6.1-1
+* Tue Mar 20 2018 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.6.1-1
 - nfs-ganesha 2.6.1 GA
 
-* Fri Mar 2 2018 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.6.0-2
+* Fri Mar 2 2018 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.6.0-2
 - nfs-ganesha 2.6.0 GA, rebuild (relink) with libntirpc-1.6.1
 
-* Tue Feb 20 2018 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.6.0-1
+* Tue Feb 20 2018 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.6.0-1
 - nfs-ganesha 2.6.0 GA
 
-* Tue Feb 20 2018 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.6.0-0.5rc5
+* Tue Feb 20 2018 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.6.0-0.5rc5
 - nfs-ganesha 2.6.0 RC5, rebuild with libntirpc-1.6.1
 
-* Fri Feb 9 2018 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.6.0-0.4rc5
+* Fri Feb 9 2018 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.6.0-0.4rc5
 - nfs-ganesha 2.6.0 RC5
 
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-0.3rc3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
-* Fri Jan 19 2018 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.6.0-0.1rc3
+* Fri Jan 19 2018 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.6.0-0.1rc3
 - nfs-ganesha 2.6.0 RC3
 
-* Wed Jan 17 2018 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.6.0-0.1rc2
+* Wed Jan 17 2018 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.6.0-0.1rc2
 - nfs-ganesha 2.6.0 RC2
 
-* Thu Jan 11 2018 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.4-2
+* Thu Jan 11 2018 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.4-2
 - rebuild with libnfsidmap (libnfsidmap.so.1)
 
-* Mon Nov 13 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.4-1
+* Mon Nov 13 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.4-1
 - nfs-ganesha 2.5.4 GA
 
-* Fri Oct 20 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.3-3
+* Fri Oct 20 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.3-3
 - nfs-ganesha 2.5.3, quiet semanage
 
-* Fri Oct 20 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.3-2
+* Fri Oct 20 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.3-2
 - nfs-ganesha 2.5.3, fix semanage in %%post
 
-* Tue Oct 10 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.3-1
+* Tue Oct 10 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.3-1
 - nfs-ganesha 2.5.3 GA
 
-* Wed Sep 27 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.2-6
+* Wed Sep 27 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.2-6
 - /var/log/ganesha -> ganesha_var_log_t
 - see https://github.com/nfs-ganesha/nfs-ganesha/issues/212
 
-* Fri Sep 22 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.2-5
+* Fri Sep 22 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.2-5
 - /var/log/ganesha -> ganesha_var_log_t
 - see https://github.com/nfs-ganesha/nfs-ganesha/issues/212
 
-* Fri Sep 22 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.2-4
+* Fri Sep 22 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.2-4
 - /var/log/ganesha owner ganesha.ganesha -> ganesha.root 
 - see https://github.com/nfs-ganesha/nfs-ganesha/issues/212
 
-* Fri Aug 25 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.2-3
+* Fri Aug 25 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.2-3
 - no rdma on arm(v7hl), FSAL_RGW, FSAL_CEPH; with ceph-12-1.4-5
 
-* Thu Aug 24 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.2-2
+* Thu Aug 24 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.2-2
 - no rdma on arm(v7hl), thus no rgw in ceph, hence no FSAL_RGW
 
-* Thu Aug 24 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.2-1
+* Thu Aug 24 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.2-1
 - nfs-ganesha 2.5.2 GA
 
-* Fri Aug 18 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.1.1-2
+* Fri Aug 18 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.1.1-2
 - /var/run -> /run
 
-* Wed Aug 2 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.1.1-1
+* 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
 
-* Fri Jul 21 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.1-1
+* Fri Jul 21 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.1-1
 - nfs-ganesha 2.5.1 GA
 
-* Wed Jul 19 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.0-4
+* Wed Jul 19 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.0-4
 - nfs-ganesha 2.5.0 rebuild with libntirpc-1.5.3
 
-* Tue Jun 27 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.0-3
+* Tue Jun 27 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.0-3
 - nfs-ganesha 2.5.0 rebuild with ceph
 
-* Sun Jun 25 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.0-2
+* Sun Jun 25 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.0-2
 - nfs-ganesha 2.5.0 rebuild with userspace-rcu-0.10.0 (liburcu-bp.so.6)
 
-* Mon Jun 12 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.0-1
+* Mon Jun 12 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.0-1
 - nfs-ganesha 2.5.0 GA
 
-* Wed Jun 7 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.0-0.10final
+* Wed Jun 7 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.0-0.10final
 - nfs-ganesha 2.5 final
 
-* Tue Jun 6 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.0-0.9rc9
+* Tue Jun 6 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.0-0.9rc9
 - nfs-ganesha 2.5 rc9
 
-* Tue May 30 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.0-0.8rc8
+* Tue May 30 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.0-0.8rc8
 - nfs-ganesha 2.5 rc8, with libntirpc-1.5.2
 
-* Mon May 22 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.0-0.7rc7
+* Mon May 22 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.0-0.7rc7
 - nfs-ganesha 2.5 rc7
 
-* Sun May 14 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.0-0.6rc6
+* Sun May 14 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.0-0.6rc6
 - nfs-ganesha 2.5 rc6
 
-* Thu May 11 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.0-0.5rc5
+* Thu May 11 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.0-0.5rc5
 - nfs-ganesha 2.5 rc5
 
-* Wed May 10 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.0-0.4rc4
+* Wed May 10 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.0-0.4rc4
 - rebuild with libntirpc-1.5.1
 
-* Mon May 8 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.0-0.3rc4
+* Mon May 8 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.0-0.3rc4
 - nfs-ganesha 2.5 rc4
 
-* Mon May 1 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.0-0.2rc3
+* Mon May 1 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.0-0.2rc3
 - nfs-ganesha 2.5 rc3
 
-* Mon Apr 24 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.0-0.1rc2
+* Mon Apr 24 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.5.0-0.1rc2
 - nfs-ganesha 2.5 rc2
 
-* Wed Apr 19 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.5-2
+* Wed Apr 19 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.5-2
 - nfs-ganesha 2.4.5 GA, w/ RGW again (cephfs-10.2.7)
 
-* Wed Apr 5 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.5-1
+* Wed Apr 5 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.5-1
 - nfs-ganesha 2.4.5 GA
 
-* Tue Mar 21 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.4-1
+* Tue Mar 21 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.4-1
 - nfs-ganesha 2.4.4 GA
 
-* Thu Feb 9 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.3-2
+* Thu Feb 9 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.3-2
 - nfs-ganesha 2.4.3 GA, reenable FSAL_CEPH and FSAL_RGW
 
-* Tue Feb 7 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.3-1
+* Tue Feb 7 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.3-1
 - nfs-ganesha 2.4.3 GA
 
-* Mon Jan 23 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.2-1
+* Mon Jan 23 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.2-1
 - nfs-ganesha 2.4.2 GA
 
 * Wed Jan 18 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com>
 - python2 (vs. python3) cleanup
 
-* Fri Dec 23 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.1-2
+* Fri Dec 23 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.1-2
 - nfs-ganesha 2.4.1 w/ FSAL_RGW
 
-* Mon Oct 31 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.1-1
+* Mon Oct 31 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.1-1
 - nfs-ganesha 2.4.1 GA
 
-* Fri Oct 28 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-2
+* Fri Oct 28 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-2
 - rebuild with libntirpc-1.4.3
 
-* Thu Sep 22 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-1
+* Thu Sep 22 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-1
 - nfs-ganesha 2.4.0 GA
 
-* Wed Sep 21 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.22rc6
+* Wed Sep 21 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-0.22rc6
 - 2.4-rc6
 
-* Fri Sep 16 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.21rc5
+* Fri Sep 16 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-0.21rc5
 - 2.4-rc5
 
-* Sun Sep 11 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.20rc4
+* Sun Sep 11 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-0.20rc4
 - 2.4-rc4
 
-* Wed Sep 7 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.19rc3
+* Wed Sep 7 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-0.19rc3
 - 2.4-rc3
 
-* Tue Sep 6 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.18rc2
+* Tue Sep 6 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-0.18rc2
 - 2.4-rc2
 
-* Mon Aug 29 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.17rc1
+* Mon Aug 29 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-0.17rc1
 - 2.4-rc1
 
-* Tue Aug 16 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.16dev29
+* Tue Aug 16 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-0.16dev29
 - 2.4-dev-29, jemalloc off by default (conflicts with glusterfs-api)
 
-* Mon Aug 15 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.15dev29
+* Mon Aug 15 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-0.15dev29
 - 2.4-dev-29
 
-* Mon Aug 1 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.14dev27
+* Mon Aug 1 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-0.14dev27
 - 2.4-dev-27
 
-* Mon Jul 25 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.13dev26
+* Mon Jul 25 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-0.13dev26
 - 2.4-dev-26
 
-* Wed Jul 20 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.12dev25
+* Wed Jul 20 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-0.12dev25
 - 2.4-dev-25 (revised 32-bit)
 
-* Tue Jul 19 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.11dev25
+* Tue Jul 19 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-0.11dev25
 - 2.4-dev-25
 
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.0-0.10dev23
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
 
-* Tue Jul 5 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.9dev23
+* Tue Jul 5 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-0.9dev23
 - 2.4-dev-23
 
-* Fri Jun 24 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.8dev21
+* Fri Jun 24 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-0.8dev21
 - 2.4-dev-21 w/ FSAL_RGW
 
-* Mon Jun 20 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.7dev21
+* Mon Jun 20 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-0.7dev21
 - 2.4-dev-21
 
-* Mon May 30 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.6dev19
+* Mon May 30 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-0.6dev19
 - 2.4-dev-19
 
-* Tue May 10 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.5dev17
+* Tue May 10 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-0.5dev17
 - 2.4-dev-17
 
-* Fri Apr 8 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.4dev14
+* Fri Apr 8 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-0.4dev14
 - 2.4-dev-14
 
-* Thu Mar 31 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.3dev12
+* Thu Mar 31 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-0.3dev12
 - 2.4-dev-12
 
-* Mon Feb 29 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.2dev10
+* Mon Feb 29 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-0.2dev10
 - 2.4-dev-10
 
-* Fri Feb 5 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.1dev7
+* Fri Feb 5 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.4.0-0.1dev7
 - 2.4-dev-7
 
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
-* Tue Nov 17 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.3.0-2
+* Tue Nov 17 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.3.0-2
 - Requires: rpcbind or portmap
 
-* Wed Oct 28 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.3.0-1
+* Wed Oct 28 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.3.0-1
 - 2.3.0 GA
 
-* Tue Oct 27 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.3.0-0.15rc8
+* Tue Oct 27 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.3.0-0.15rc8
 - 2.3.0 RC8, rebuild with libntirpc-1.3.1, again
 
-* Mon Oct 26 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.3.0-0.14rc8
+* Mon Oct 26 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.3.0-0.14rc8
 - 2.3.0 RC8, rebuild with libntirpc-1.3.1
 
-* Sun Oct 25 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.3.0-0.13rc8
+* Sun Oct 25 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.3.0-0.13rc8
 - 2.3.0 RC8
 
-* Thu Oct 22 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.3.0-0.12rc7
+* Thu Oct 22 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.3.0-0.12rc7
 - 2.3.0 RC7 (N.B. 2.3.0-0.11rc6 was really rc7)
 
-* Mon Oct 19 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.3.0-0.11rc7
+* Mon Oct 19 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.3.0-0.11rc7
 - 2.3.0 RC7
 
-* Mon Oct 12 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.3.0-0.10rc6
+* Mon Oct 12 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.3.0-0.10rc6
 - 2.3.0 RC6
 
-* Thu Oct 8 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.3.0-0.9rc5
+* Thu Oct 8 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.3.0-0.9rc5
 - 2.3.0 RC5 w/ CMakeLists.txt.patch and config-h.in.cmake.patch
 
-* Wed Oct 7 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.3.0-0.8rc5
+* Wed Oct 7 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.3.0-0.8rc5
 - 2.3.0 RC5 mount-9p w/o Requires: nfs-ganesha
 
-* Tue Oct 6 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.3.0-0.7rc5
+* Tue Oct 6 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.3.0-0.7rc5
 - 2.3.0 RC5 revised scripts/ganeshactl/CMakeLists.txt.patch
 
-* Mon Oct 5 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.3.0-0.6rc5
+* Mon Oct 5 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.3.0-0.6rc5
 - 2.3.0 RC5
 
-* Mon Sep 28 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.3.0-0.5rc4
+* Mon Sep 28 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.3.0-0.5rc4
 - 2.3.0 RC4
 
-* Fri Sep 18 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.3.0-0.4rc3
+* Fri Sep 18 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.3.0-0.4rc3
 - 2.3.0 RC3
 
-* Fri Sep 11 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.3.0-0.3rc2
+* Fri Sep 11 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.3.0-0.3rc2
 - 2.3.0 RC2
 
-* Fri Sep 11 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.3.0-0.2rc1
+* Fri Sep 11 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.3.0-0.2rc1
 - 2.3.0 RC1, revised .../SAL/nfs4_state_id.c.patch
 
-* Wed Sep 9 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.3.0-0.1rc1
+* Wed Sep 9 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.3.0-0.1rc1
 - 2.3.0 RC1
 
-* Sat Aug 29 2015 Niels de Vos <ndevos@redhat.com> 2.2.0-6
+* Sat Aug 29 2015 Niels de Vos <ndevos@redhat.com> - 2.2.0-6
 - Rebuilt for jemalloc SONAME bump
 
-* Fri Jul 17 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-5
+* Fri Jul 17 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.2.0-5
 - BuildRequires: libntirprc on base
 
-* Fri Jul 17 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-4
+* Fri Jul 17 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.2.0-4
 - link with unbundled, shared libntirpc
 
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-3
@@ -1018,76 +1023,76 @@ exit 0
 * Wed May 27 2015 Niels de Vos <ndevos@redhat.com>
 - improve readability and allow "rpmbuild --with .." options again
 
-* Fri May 15 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-2
+* Fri May 15 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.2.0-2
 - %%license, build with glusterfs-3.7.0 GA
 
-* Tue Apr 21 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-1
+* Tue Apr 21 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.2.0-1
 - 2.2.0 GA
 
-* Mon Apr 20 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.13rc-final
+* Mon Apr 20 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.2.0-0.13rc-final
 - 2.2.0-0.13rc-final
 
-* Mon Apr 13 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.12rc8
+* Mon Apr 13 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.2.0-0.12rc8
 - 2.2.0-0.12rc8
 
-* Mon Apr 6 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.11rc7
+* Mon Apr 6 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.2.0-0.11rc7
 - 2.2.0-0.11rc7
 
-* Thu Apr 2 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.10rc6
+* Thu Apr 2 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.2.0-0.10rc6
 - 2.2.0-0.10rc6, with unbundled libntirpc
 
-* Mon Mar 30 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.9rc6
+* Mon Mar 30 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.2.0-0.9rc6
 - 2.2.0-0.9rc6
 
-* Sun Mar 22 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.8rc5
+* Sun Mar 22 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.2.0-0.8rc5
 - 2.2.0-0.8rc5
 
-* Tue Mar 17 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.7rc4
+* Tue Mar 17 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.2.0-0.7rc4
 - ntirpc-1.2.1.tar.gz
 
-* Tue Mar 17 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.6rc4
+* Tue Mar 17 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.2.0-0.6rc4
 - updated ntirpc-1.2.0.tar.gz
 
-* Sun Mar 15 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.5rc4
+* Sun Mar 15 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.2.0-0.5rc4
 - 2.2.0-0.5rc4
 
-* Mon Feb 23 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.4rc3
+* Mon Feb 23 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.2.0-0.4rc3
 - 2.2.0-0.4rc3
 
-* Mon Feb 16 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.3rc2
+* Mon Feb 16 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.2.0-0.3rc2
 - subpackage Requires: nfs-ganesha = %%{version}-%%{release}
 
-* Mon Feb 16 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.2rc2
+* Mon Feb 16 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.2.0-0.2rc2
 - 2.2.0-0.2rc2
 
-* Fri Feb 13 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.1rc1
+* Fri Feb 13 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.2.0-0.1rc1
 - 2.2.0-0.1rc1
 - nfs-ganesha.spec based on upstream
 
-* Thu Feb 12 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.1.0-14
+* Thu Feb 12 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.1.0-14
 - Fedora 23/rawhide build fixes
 - Ceph restored in EPEL
 
-* Mon Jan 19 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.1.0-13
+* Mon Jan 19 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.1.0-13
 - Ceph retired from EPEL 7
 
-* Thu Nov 6 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.1.0-12
+* Thu Nov 6 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.1.0-12
 - rebuild after libnfsidmap symbol version revert
 
-* Wed Oct 29 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.1.0-11
+* Wed Oct 29 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.1.0-11
 - PyQt -> PyQt4 typo
 
-* Mon Oct 27 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.1.0-10
+* Mon Oct 27 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.1.0-10
 - use upstream init.d script
 
-* Thu Oct 2 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.1.0-9
+* Thu Oct 2 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.1.0-9
 - restore exclusion of gluster gfapi on rhel
 
-* Thu Oct 2 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.1.0-8
+* Thu Oct 2 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.1.0-8
 - install /etc/dbus-1/system.d/org.ganesha.nfsd.conf
 - build and install admin tools
 
-* Mon Sep 29 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.1.0-7
+* Mon Sep 29 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.1.0-7
 - install /etc/sysconfig/nfs-ganesha file
 
 * Fri Aug 29 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com>
@@ -1096,28 +1101,28 @@ exit 0
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
-* Thu Jul 24 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.1.0-5
+* Thu Jul 24 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.1.0-5
 - use upstream nfs-ganesha.service
 
-* Fri Jul 11 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.1.0-4
+* Fri Jul 11 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.1.0-4
 - keep fsal .so files, implementation now uses them
 
-* Tue Jul 1 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.1.0-3
+* Tue Jul 1 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.1.0-3
 - static libuid2grp
 
-* Tue Jul 1 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.1.0-2
+* Tue Jul 1 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.1.0-2
 - add libuid2grp.so
 
-* Mon Jun 30 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.1.0-1
+* Mon Jun 30 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.1.0-1
 - nfs-ganesha-2.1.0 GA
 
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-* Mon Jun 2 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.0.0-9
+* Mon Jun 2 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.0.0-9
 - Ceph FSAL enabled with ceph-0.80
 
-* Wed May 21 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.0.0-8
+* Wed May 21 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.0.0-8
 - getdents()->getdents64(), struct dirent -> struct dirent64
 
 * Sat May 10 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com>
@@ -1126,7 +1131,7 @@ exit 0
 * Sat May 10 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com>
 - exclude libfsalgluster correctly
 
-* Fri May 9 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.0.0-7
+* Fri May 9 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.0.0-7
 - Ceph FSAL, in a subpackage, (but requires ceph >= 0.78)
 
 * Mon Mar 31 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com>
@@ -1136,26 +1141,26 @@ exit 0
 * Tue Jan 21 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com>
 - sussed out github archive so as to allow correct Source0
 
-* Fri Jan 17 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.0.0-6
+* Fri Jan 17 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.0.0-6
 - EPEL7 and xfsprogs
 
-* Fri Jan 17 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.0.0-5
+* Fri Jan 17 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.0.0-5
 - EPEL7
 
-* Mon Jan 6 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.0.0-4
+* Mon Jan 6 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.0.0-4
 - with glusterfs-api(-devel) >= 3.4.2
 
-* Sat Jan 4 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.0.0-3
+* Sat Jan 4 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.0.0-3
 - with glusterfs-api
 
-* Thu Jan 2 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.0.0-2
+* Thu Jan 2 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.0.0-2
 - Build on RHEL6. Add sample init.d script
 
 * Wed Dec 11 2013 Jim Lieb <lieb@sea-troll.net> - 2.0.0-1
 - Update to V2.0.0 release
 
-* Mon Nov 25 2013 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.0.0-0.2.rcfinal
+* Mon Nov 25 2013 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.0.0-0.2.rcfinal
 - update to RC-final
 
-* Fri Nov 22 2013 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.0.0-0.1.rc5
+* Fri Nov 22 2013 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.0.0-0.1.rc5
 - Initial commit
diff --git a/xattr.patch b/xattr.patch
new file mode 100644
index 0000000..934ee66
--- /dev/null
+++ b/xattr.patch
@@ -0,0 +1,29 @@
+--- nfs-ganesha-2.6.2/src/CMakeLists.txt.orig	2018-07-17 11:47:09.637390285 -0400
++++ nfs-ganesha-2.6.2/src/CMakeLists.txt	2018-07-17 11:47:50.668390285 -0400
+@@ -586,12 +586,12 @@
+   endif(NOT GFAPI_FOUND)
+ 
+   if(USE_FSAL_GLUSTER)
+-    check_include_files("unistd.h;attr/xattr.h" HAVE_XATTR_H)
++    check_include_files("unistd.h;sys/xattr.h" HAVE_XATTR_H)
+     if(NOT HAVE_XATTR_H)
+       if(STRICT_PACKAGE)
+-        message(FATAL_ERROR "STRICT PACKAGE: Can not find attr/xattr.h, disabling GLUSTER fsal build")
++        message(FATAL_ERROR "STRICT PACKAGE: Can not find sys/xattr.h, disabling GLUSTER fsal build")
+       else(STRICT_PACKAGE)
+-        message(WARNING "Can not find attr/xattr.h, disabling GLUSTER fsal build")
++        message(WARNING "Can not find sys/xattr.h, disabling GLUSTER fsal build")
+         set(USE_FSAL_GLUSTER OFF)
+       endif(STRICT_PACKAGE)
+     endif(NOT HAVE_XATTR_H)
+--- nfs-ganesha-2.6.2/src/FSAL/FSAL_GLUSTER/gluster_internal.c.orig	2018-07-17 11:49:01.863390285 -0400
++++ nfs-ganesha-2.6.2/src/FSAL/FSAL_GLUSTER/gluster_internal.c	2018-07-17 11:48:32.581390285 -0400
+@@ -26,7 +26,7 @@
+  */
+ 
+ #include <sys/types.h>
+-#include <attr/xattr.h> /* ENOATTR */
++#include "os/xattr.h" /* ENOATTR */
+ #include "gluster_internal.h"
+ #include "fsal_api.h"
+ #include "fsal_convert.h"