From 0b3779ea1eb639c75c88f99043f9694dbb14261b Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Mon, 15 Aug 2016 13:58:11 -0400
Subject: [PATCH] 2.4-dev-29

---
 nfs-ganesha-2.4dev29-FSAL.patch | 20 ++++++++++++++++++++
 nfs-ganesha.spec                | 18 +++++++++---------
 sources                         |  2 +-
 3 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 nfs-ganesha-2.4dev29-FSAL.patch

diff --git a/nfs-ganesha-2.4dev29-FSAL.patch b/nfs-ganesha-2.4dev29-FSAL.patch
new file mode 100644
index 0000000..0c91b66
--- /dev/null
+++ b/nfs-ganesha-2.4dev29-FSAL.patch
@@ -0,0 +1,20 @@
+--- nfs-ganesha-2.4-dev-29/src/FSAL/FSAL_VFS/handle.c.orig	2016-08-15 13:40:03.546478618 -0400
++++ nfs-ganesha-2.4-dev-29/src/FSAL/FSAL_VFS/handle.c	2016-08-15 13:47:10.254478618 -0400
+@@ -32,6 +32,7 @@
+ 
+ #include "config.h"
+ 
++#include <sys/sysmacros.h> /* for makedev(3) */
+ #include <libgen.h>		/* used for 'dirname' */
+ #include <pthread.h>
+ #include <string.h>
+--- nfs-ganesha-2.4-dev-29/src/FSAL/FSAL_CEPH/handle.c.orig	2016-08-15 13:45:20.288478618 -0400
++++ nfs-ganesha-2.4-dev-29/src/FSAL/FSAL_CEPH/handle.c	2016-08-15 13:46:43.061478618 -0400
+@@ -31,6 +31,7 @@
+  * fsal_obj_handle type.
+  */
+ 
++#include <sys/sysmacros.h> /* for makedev(3) */
+ #include <fcntl.h>
+ #include <cephfs/libcephfs.h>
+ #include "fsal.h"
diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index 3e43e8c..c0bf810 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -74,15 +74,16 @@ Requires: sles-release >= 12
 
 Name:		nfs-ganesha
 Version:	2.4.0
-%global		dev dev27
-%global		dash_dev_version 2.4-dev-27
-Release:	0.14%{?dev:%{dev}}%{?dist}
+%global		dev dev29
+%global		dash_dev_version 2.4-dev-29
+Release:	0.15%{?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.4dev29-FSAL.patch
 
 
 BuildRequires:	cmake
@@ -189,6 +190,7 @@ BuildRequires:	PyQt4-devel
 Requires:	PyQt4
 %endif
 %endif
+BuildRequires:  python-devel
 Requires: nfs-ganesha = %{version}-%{release}, python
 
 %description utils
@@ -302,6 +304,7 @@ 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		\
@@ -363,12 +366,6 @@ install -m 755 scripts/init.d/nfs-ganesha.el6		%{buildroot}%{_sysconfdir}/init.d
 install -m 644 scripts/init.d/sysconfig/ganesha		%{buildroot}%{_sysconfdir}/sysconfig/ganesha
 %endif
 
-%if %{with utils} && 0%{?rhel} && 0%{?rhel} <= 6
-%{!?__python2: %global __python2 /usr/bin/python2}
-%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%endif
-
 %if %{with xfs}
 install -m 644 config_samples/xfs.conf %{buildroot}%{_sysconfdir}/ganesha
 %endif
@@ -552,6 +549,9 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null
 %endif
 
 %changelog
+* 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
 - 2.4-dev-27
 
diff --git a/sources b/sources
index ea4dcc0..ca83076 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-daaa58585e1ccdd16490e1a51c68e6c3  nfs-ganesha-2.4-dev-27.tar.gz
+c5e2ceb06aebef6bf63eb86d845ec4b3  nfs-ganesha-2.4-dev-29.tar.gz