From ad7af46fdf175a14ae1a34cc56a3ded5be7af185 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Mon, 31 Mar 2014 09:40:29 -0400
Subject: [PATCH] glusterfs fsal in a subpackage, jemalloc now available for
 EPEL7

---
 nfs-ganesha.spec | 45 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index 31b93b6..d32bb76 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -10,13 +10,14 @@
 %endif
 
 # GlusterFS is not available in EPEL
+# RHEL currently 3.4.0 client, but nfs-ganesha needs 3.4.2.
 %if ( ! 0%{?rhel} )
 %global           with_glusterfs true
 %endif
 
 Name:              nfs-ganesha
 Version:           2.0.0
-Release:           6%{?prereltag:.%{prereltag}}%{?dist}
+Release:           7%{?prereltag:.%{prereltag}}%{?dist}
 Summary:           Ganesha NFS Server
 Group:             System Environment/Libraries
 License:           LGPLv3+
@@ -53,19 +54,13 @@ BuildRequires:     pkgconfig
 BuildRequires:     doxygen
 BuildRequires:     krb5-devel
 BuildRequires:     dbus-devel
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} < 7 )
-# jemalloc not in rhel7 yet
 BuildRequires:     jemalloc-devel
-%endif
 %if ( 0%{?fedora} && 0%{?fedora} > 16 ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
 BuildRequires:     xfsprogs-devel
 BuildRequires:     libnfsidmap-devel
 BuildRequires:     libwbclient-devel
 %endif
 BuildRequires:     libcap-devel
-%if ( 0%{?with_glusterfs:1} )
-BuildRequires:     glusterfs-api-devel >= 3.4.2
-%endif
 
 %if ( 0%{?_with_systemd:1} )
 Requires(post):    systemd
@@ -78,13 +73,7 @@ Requires(preun):  /sbin/chkconfig
 Requires(postun): /sbin/service
 %endif
 Requires:          dbus
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} < 7 )
-# jemalloc not in rhel7 yet
 Requires:          jemalloc
-%endif
-%if ( 0%{?with_glusterfs:1} )
-Requires:          glusterfs-api >= 3.4.2
-%endif
 
 %description
 NFS-Ganesha is a user mode file server with support for both the
@@ -97,6 +86,26 @@ via the kernel. Other back-ends can support user mode library based
 clusters such as CEPH and GLUSTERFS. There is also a PROXY back-end
 which operates as an NFSv4 client.
 
+%if ( 0%{?with_glusterfs:1} )
+%package fsal-gluster
+Summary:           Ganesha NFS Server GlusterFS FSAL
+Requires:          glusterfs-api >= 3.4.2
+BuildRequires:     glusterfs-api-devel >= 3.4.2
+
+%description fsal-gluster
+GlusterFS FSAL for nfs-ganesha
+
+NFS-Ganesha is a user mode file server with support for both the
+NFS suite and 9P, the Plan 9 remote file access protocol. It uses
+an internal meta data cache and state manager for performance. It
+also provides support for pNFS for multiple clustered file systems
+both open source and proprietary. Multiple file systems are supported
+via loadable back-end drivers. The VFS back-end supports file systems
+via the kernel. Other back-ends can support user mode library based
+clusters such as CEPH and GLUSTERFS. There is also a PROXY back-end
+which operates as an NFSv4 client.
+%endif
+
 %package docs
 Summary:           Ganesha NFS Server Documentation
 BuildArch:         noarch
@@ -172,6 +181,7 @@ install -D -p -m 0744 %{SOURCE4} %{buildroot}%{_sbindir}/nfs_ganesha.sh
 %files
 %doc src/ChangeLog src/LICENSE.txt src/TODO src/Docs/*.pdf
 %exclude %{_pkgdocdir}/*.pdf
+%exclude %{_libdir}/ganesha/libfsalgluster.*
 %{_libdir}/*
 %{_bindir}/*
 %if ( 0%{?_with_systemd:1} )
@@ -181,12 +191,21 @@ install -D -p -m 0744 %{SOURCE4} %{buildroot}%{_sbindir}/nfs_ganesha.sh
 %{_sbindir}/*
 %endif
 
+%if ( 0%{?with_glusterfs:1} )
+%files fsal-gluster
+%{_libdir}/ganesha/libfsalgluster.*
+%endif
+
 %files docs
 %{_pkgdocdir}/LICENSE.txt
 %{_pkgdocdir}/*
 %dir %{_pkgdocdir}
 
 %changelog
+* Mon Mar 31 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com>
+- GlusterFS FSAL in a subpackage
+- EPEL7 has jemalloc as of 2014-02-25
+
 * Tue Jan 21 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com>
 - sussed out github archive so as to allow correct Source0