link with unbundled, shared libntirpc

nfs-ganesha-2.2.0-CMakeLists.txt.patch

@@ -1,11 +1,12 @@
---- nfs-ganesha-2.2-rc6/src/CMakeLists.txt.orig	2015-04-01 15:33:18.887000000 -0400
-+++ nfs-ganesha-2.2-rc6/src/CMakeLists.txt	2015-04-02 12:16:44.245000000 -0400
-@@ -716,12 +716,15 @@
+--- nfs-ganesha-2.2.0/src/CMakeLists.txt.orig	2015-07-07 13:43:35.435240859 -0400
++++ nfs-ganesha-2.2.0/src/CMakeLists.txt	2015-07-07 13:48:51.917240859 -0400
+@@ -716,9 +716,12 @@
     set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/portability_cmake_2.8  /usr/share/cmake/Modules ${CMAKE_MODULE_PATH})
  endif( "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_LESS "2.8" )
  
 +find_library(LIBNTIRPC ntirpc)  # extended Pthreads functions
-+set(LIBTIRPC_INCLUDE_DIR "/usr/include/ntirpc")
++
++set(CMAKE_C_FLAGS "-isystem /usr/include/ntirpc ${CMAKE_C_FLAGS}")
 +
  include_directories(
    "${PROJECT_BINARY_DIR}/include"
@@ -13,10 +14,6 @@
    "${PROJECT_SOURCE_DIR}/include"
    "${OS_INCLUDE_DIR}"
    "${KRB5_INCLUDE_DIRS}"
-+  "${LIBTIRPC_INCLUDE_DIR}"
- )
- 
- # Fixup loose bits of autotools legacy
 @@ -732,14 +735,13 @@
    set(_USE_CB_SIMULATOR ON)
  endif(USE_CB_SIMULATOR)

nfs-ganesha.spec

@@ -76,7 +76,7 @@
 
 Name:		nfs-ganesha
 Version:	2.2.0
-Release:	3%{?dev_version:%{dev_version}}%{?dist}
+Release:	4%{?dev_version:%{dev_version}}%{?dist}
 Summary:	NFS-Ganesha is a NFS Server running in user space
 Group:		Applications/System
 License:	LGPLv3+
@@ -303,7 +303,7 @@ Group: Applications/System
 Requires: nfs-ganesha = %{version}-%{release}
 BuildRequires:	glusterfs-api-devel >= 3.5.1
 BuildRequires:	libattr-devel
-BuildRequires:	libntirpc-devel
+BuildRequires:	libntirpc-devel >= 1.2.1-3
 
 %description gluster
 This package contains a FSAL shared object to
@@ -564,6 +564,9 @@ mv %{buildroot}/usr%{_sysconfdir}/ganesha/ganesha.conf %{buildroot}%{_sysconfdir
 %endif
 
 %changelog
+* Fri Jul 17 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-4
+- link with unbundled, shared libntirpc
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild