From 36130fd1b0cec2a318b39e45adeb1906b043b46c Mon Sep 17 00:00:00 2001
From: Kaleb S KEITHLEY <kkeithle@redhat.com>
Date: Fri, 8 Apr 2016 08:52:46 -0400
Subject: [PATCH] 2.4-dev-14

---
 nfs-ganesha.spec | 14 ++++++++++----
 sources          |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index ba114c2..f6e470c 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -81,8 +81,8 @@
 
 Name:		nfs-ganesha
 Version:	2.4.0
-%global		dev dev12
-%global		dash_dev_version 2.4-dev-12
+%global		dev dev14
+%global		dash_dev_version 2.4-dev-14
 Release:	0.3%{?dev:%{dev}}%{?dist}
 Summary:	NFS-Ganesha is a NFS Server running in user space
 Group:		Applications/System
@@ -90,7 +90,6 @@ License:	LGPLv3+
 Url:		https://github.com/nfs-ganesha/nfs-ganesha/wiki
 
 Source0:	https://github.com/%{name}/%{name}/archive/V%{dash_dev_version}/%{name}-%{dash_dev_version}.tar.gz
-Patch0:		nfs-ganesha-2.4dev12-include-nfsv41.patch
 
 BuildRequires:	cmake
 BuildRequires:	bison
@@ -347,7 +346,6 @@ be used with NFS-Ganesha to support Gluster
 %prep
 %setup -q -n %{name}-%{dash_dev_version}
 rm -rf contrib/libzfswrapper
-%patch0 -p1
 
 %build
 cd src && %cmake . -DCMAKE_BUILD_TYPE=Debug		\
@@ -433,6 +431,10 @@ install -m 644 config_samples/ceph.conf %{buildroot}%{_sysconfdir}/ganesha
 install -m 755 config_samples/lustre.conf %{buildroot}%{_sysconfdir}/ganesha
 %endif
 
+%if %{with gluster}
+install -m 644 config_samples/logrotate_fsal_gluster %{buildroot}%{_sysconfdir}/logrotate.d/ganesha-gfapi
+%endif
+
 %if %{with gpfs}
 install -m 755 scripts/gpfs-epoch %{buildroot}%{_libexecdir}/ganesha
 install -m 644 config_samples/gpfs.conf	%{buildroot}%{_sysconfdir}/ganesha
@@ -562,6 +564,7 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null
 
 %if %{with gluster}
 %files gluster
+%config(noreplace) %{_sysconfdir}/logrotate.d/ganesha-gfapi
 %{_libdir}/ganesha/libfsalgluster*
 %endif
 
@@ -609,6 +612,9 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null
 %endif
 
 %changelog
+* Fri Apr 8 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.3dev14
+- 2.4-dev-14
+
 * Thu Mar 31 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.3dev12
 - 2.4-dev-12
 
diff --git a/sources b/sources
index 4edcf0d..0e5feb3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3742ba2cf13aa797783e6b402268d31f  nfs-ganesha-2.4-dev-12.tar.gz
+202ea149815c052384c62bde39d06717  nfs-ganesha-2.4-dev-14.tar.gz