kkeithle pushed to nfs-ganesha (f22). "2.2.0-0.12rc-final"

[notifications at fedoraproject.org]

>From f844f3c3a79e6e629a7b6bee69ef0f37e3f255f2 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle at redhat.com>
Date: Mon, 20 Apr 2015 10:07:17 -0400
Subject: 2.2.0-0.12rc-final


diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index 33a0fb4..fdff3ba 100644
--- a/nfs-ganesha.spec
+++ b/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-rc-final
 
 Name:		nfs-ganesha
@@ -88,7 +90,6 @@ Source1:	https://github.com/%{name}/%{ntirpcname}/archive/v%{ntirpcvers}/%{ntirp
 # Bundling exception through Fedora 23
 # https://fedorahosted.org/fpc/ticket/363
 Provides:	bundled(libntirpc)
-Patch0:		nfs-ganesha-2.2.0-CMakeLists.txt.patch
 
 %if ( 0%{?rhel} && 0%{?rhel} < 7 )
 BuildRequires:	cmake28
@@ -319,9 +320,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
 %if ( 0%{?rhel} && 0%{?rhel} < 7 )
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/nfs-ganesha.git/commit/?h=f22&id=f844f3c3a79e6e629a7b6bee69ef0f37e3f255f2