%license

nfs-ganesha.spec

@@ -72,6 +72,8 @@
 
 #%%global dev_version %{lua: extraver = string.gsub('-rc-final', '%-', ''); print(extraver) }
 
+%global		ntirpcname	ntirpc
+%global		ntirpcvers	1.2.1
 %global		versiontag	2.2.0
 
 Name:		nfs-ganesha
@@ -83,7 +85,11 @@ License:	LGPLv3+
 Url:		https://github.com/nfs-ganesha/nfs-ganesha/wiki
 
 Source0:	https://github.com/%{name}/%{name}/archive/V%{versiontag}/%{name}-%{version}.tar.gz
-Patch0:		nfs-ganesha-2.2.0-CMakeLists.txt.patch
+Source1:	https://github.com/%{name}/%{ntirpcname}/archive/v%{ntirpcvers}/%{ntirpcname}-%{ntirpcvers}.tar.gz
+
+# Bundling exception through Fedora 23
+# https://fedorahosted.org/fpc/ticket/363
+Provides:	bundled(libntirpc)
 
 BuildRequires:	cmake
 BuildRequires:	bison flex
@@ -303,7 +309,6 @@ Group: Applications/System
 Requires: nfs-ganesha = %{version}-%{release}
 BuildRequires:	glusterfs-api-devel >= 3.5.1
 BuildRequires:	libattr-devel
-BuildRequires:	libntirpc-devel
 
 %description gluster
 This package contains a FSAL shared object to
@@ -311,9 +316,9 @@ be used with NFS-Ganesha to support Gluster
 %endif
 
 %prep
-%setup -q -n %{name}-%{versiontag}
+%setup -q -n %{name}-%{versiontag} -a 1
 rm -rf contrib/libzfswrapper
-%patch0 -p1
+mv %{ntirpcname}-%{ntirpcvers}/* src/libntirpc/
 
 %build
 %cmake ./src -DCMAKE_BUILD_TYPE=Debug			\
@@ -565,23 +570,19 @@ mv %{buildroot}/usr%{_sysconfdir}/ganesha/ganesha.conf %{buildroot}%{_sysconfdir
 
 %changelog
 * Fri May 15 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-2
-- %license, build with glusterfs-3.7.0 GA
+- %license
 
 * Tue Apr 21 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-1
 - 2.2.0 GA
 
-* Mon Apr 20 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.13rc-final
-- 2.2.0-0.13rc-final
+* Mon Apr 20 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.12rc-final
+- 2.2.0-0.12rc-final
 
-* Mon Apr 13 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.12rc8
-- 2.2.0-0.12rc8
-
-* Mon Apr 6 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.11rc7
-- 2.2.0-0.11rc7
-
-* Thu Apr 2 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.10rc6
-- 2.2.0-0.10rc6, with unbundled libntirpc
+* Mon Apr 13 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.11rc8
+- 2.2.0-0.11rc8
 
+* Mon Apr 6 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.10rc7
+- 2.2.0-0.10rc7
 * Mon Mar 30 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.9rc6
 - 2.2.0-0.9rc6
 

sources

@@ -1 +1,2 @@
 e2d8e66ab4f78e3ecf1582cfa26c7d37  nfs-ganesha-2.2.0.tar.gz
+e46e22bf9b312a7e92684a177f1f46d7  ntirpc-1.2.1.tar.gz