From fbbaa05230d632e9a9a9431742048c59d956aeaf Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Wed, 17 Jan 2018 14:32:41 -0500
Subject: [PATCH] nfs-ganesha 2.6.0 RC2

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
---
 nfs-ganesha.spec | 26 +++++++++++++++-----------
 sources          |  2 +-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index 0f32f15..447c2f1 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -94,25 +94,28 @@ Requires: openSUSE-release
 %global _rundir %{_localstatedir}/run
 %endif
 
-%global dev_version %{lua: s = string.gsub('@GANESHA_EXTRA_VERSION@', '^%-', ''); s2 = string.gsub(s, '%-', '.'); print(s2) }
-# %%global	dev final
-# %%global	dash_dev_version 2.5-final
+%global dev_version %{lua: s = string.gsub('@GANESHA_EXTRA_VERSION@', '^%-', ''); s2 = string.gsub(s, '%-', '.'); print((s2 ~= nil and s2 ~= '') and s2 or "0.1") }
+%global	dev rc2
+%global	dash_dev_version 2.6-rc2
 
 Name:		nfs-ganesha
-Version:	2.5.4
-Release:	2%{?dev:%{dev}}%{?dist}
+Version:	2.6.0
+Release:	0.1%{?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
+Source0:	https://github.com/%{name}/%{name}/archive/V%{dash_dev_version}/%{name}-%{dash_dev_version}.tar.gz
 
 BuildRequires:	cmake
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	pkgconfig
 BuildRequires:	krb5-devel
+%if ( 0%{?suse_version} >= 1330 )
+BuildRequires:  libnsl-devel
+%endif
 %if ( 0%{?suse_version} )
 BuildRequires:	dbus-1-devel
 Requires:	dbus-1
@@ -126,7 +129,7 @@ BuildRequires:	libblkid-devel
 BuildRequires:	libuuid-devel
 BuildRequires:	gcc-c++
 %if %{with system_ntirpc}
-BuildRequires:	libntirpc-devel >= 1.5.3
+BuildRequires:	libntirpc-devel >= 1.6.0
 %else
 Requires: libntirpc = @NTIRPC_VERSION_EMBED@
 %endif
@@ -402,8 +405,7 @@ Development headers and auxiliary files for developing with %{name}.
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}
-rm -rf contrib/libzfswrapper
+%setup -q -n %{name}-%{dash_dev_version}
 
 %build
 cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo	\
@@ -411,7 +413,6 @@ cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo	\
 	-DDSANITIZE_ADDRESS=OFF				\
 	-DUSE_FSAL_NULL=%{use_fsal_null}		\
 	-DUSE_FSAL_MEM=%{use_fsal_mem}			\
-	-DUSE_FSAL_ZFS=NO				\
 	-DUSE_FSAL_XFS=%{use_fsal_xfs}			\
 	-DUSE_FSAL_CEPH=%{use_fsal_ceph}		\
 	-DUSE_FSAL_RGW=%{use_fsal_rgw}			\
@@ -677,7 +678,7 @@ exit 0
 %files -n libntirpc
 %defattr(-,root,root,-)
 %{_libdir}/libntirpc.so.@NTIRPC_VERSION_EMBED@
-%{_libdir}/libntirpc.so.1.5
+%{_libdir}/libntirpc.so.1.6
 %{_libdir}/libntirpc.so
 %{!?_licensedir:%global license %%doc}
 %license libntirpc/COPYING
@@ -728,6 +729,9 @@ exit 0
 %endif
 
 %changelog
+* 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
 - rebuild with libnfsidmap (libnfsidmap.so.1)
 
diff --git a/sources b/sources
index ab17035..2314382 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nfs-ganesha-2.5.4.tar.gz) = ae85834b4160913d1050079897cf7e5be6f319f64010d1a8b43258271d5b4ac228a12ec30e6dc1267b6e5ea53743550e274cfa4ed9c0bb497ea826173f1fa79f
+SHA512 (nfs-ganesha-2.6-rc2.tar.gz) = 8996a220e28328506cb3ec0abce4bc1b351ba6bc8a4c9d361072a8b75b5bae41c30b13ecefc9433c3ca006b7c0d7456f2b2cd549865722f13911961224dc70be