From ee3c33d435fc3e462ea43fef5f04b2aa6175f848 Mon Sep 17 00:00:00 2001
From: Kaleb S KEITHLEY <kkeithle@redhat.com>
Date: Mon, 30 May 2016 09:06:54 -0400
Subject: [PATCH] 2.4-dev-19

---
 nfs-ganesha-2.4dev19-FSAL-FSAL_CEPH-handle.patch | 11 +++++++++++
 nfs-ganesha.spec                                 | 13 ++++++++-----
 sources                                          |  2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 nfs-ganesha-2.4dev19-FSAL-FSAL_CEPH-handle.patch

diff --git a/nfs-ganesha-2.4dev19-FSAL-FSAL_CEPH-handle.patch b/nfs-ganesha-2.4dev19-FSAL-FSAL_CEPH-handle.patch
new file mode 100644
index 0000000..59f6d0e
--- /dev/null
+++ b/nfs-ganesha-2.4dev19-FSAL-FSAL_CEPH-handle.patch
@@ -0,0 +1,11 @@
+--- nfs-ganesha-2.4-dev-19/src/FSAL/FSAL_CEPH/handle.c.orig	2016-05-30 08:54:35.653769734 -0400
++++ nfs-ganesha-2.4-dev-19/src/FSAL/FSAL_CEPH/handle.c	2016-05-30 08:55:35.314769734 -0400
+@@ -233,7 +233,7 @@
+ 	}
+ 
+ 	LogFullDebug(COMPONENT_FSAL,
+-		     "Created %s inode %lu Inode %p",
++		     "Created %s inode %" PRIu64 " Inode %p",
+ 		     name, st.st_ino, i);
+ 
+ 	construct_handle(&st, i, export, &obj);
diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index 36f76b8..76c4c58 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -81,16 +81,16 @@
 
 Name:		nfs-ganesha
 Version:	2.4.0
-%global		dev dev17
-%global		dash_dev_version 2.4-dev-17
-Release:	0.5%{?dev:%{dev}}%{?dist}
+%global		dev dev19
+%global		dash_dev_version 2.4-dev-19
+Release:	0.6%{?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%{dash_dev_version}/%{name}-%{dash_dev_version}.tar.gz
-Patch0:		nfs-ganesha-2.4dev17-FSAL-fsal_helper.patch
+Patch0:		nfs-ganesha-2.4dev19-FSAL-FSAL_CEPH-handle.patch
 
 BuildRequires:	cmake
 BuildRequires:	bison
@@ -407,7 +407,7 @@ install -m 644 scripts/systemd/nfs-ganesha-config.service	%{buildroot}%{_unitdir
 install -m 644 scripts/systemd/sysconfig/nfs-ganesha	%{buildroot}%{_sysconfdir}/sysconfig/ganesha
 %else
 mkdir -p %{buildroot}%{_sysconfdir}/init.d
-install -m 755 scripts/init.d/nfs-ganesha		%{buildroot}%{_sysconfdir}/init.d/nfs-ganesha
+install -m 755 scripts/init.d/nfs-ganesha.el6		%{buildroot}%{_sysconfdir}/init.d/nfs-ganesha
 install -m 644 scripts/init.d/sysconfig/ganesha		%{buildroot}%{_sysconfdir}/sysconfig/ganesha
 %endif
 
@@ -614,6 +614,9 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null
 %endif
 
 %changelog
+* 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
 - 2.4-dev-17
 
diff --git a/sources b/sources
index 4130f1c..5cb4fc3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-26b8c5411c131e33a273afd828680d76  nfs-ganesha-2.4-dev-17.tar.gz
+7958c34a61ba8cf17983e0f7470e5f90  nfs-ganesha-2.4-dev-19.tar.gz