From 6bd1acb1191af55da553b8e51e32fa968aebbd6b Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Tue, 21 Apr 2015 12:31:53 -0400
Subject: [PATCH 1/2] 2.2.0 GA

---
 nfs-ganesha.spec | 18 +++++++-----------
 sources          |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index e8eb7b8..99372f6 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -70,26 +70,22 @@
 %bcond_without gui_utils
 %global use_gui_utils %{on_off_switch gui_utils}
 
-%global dev_version %{lua: extraver = string.gsub('-rc-final', '%-', ''); print(extraver) }
+#%%global dev_version %{lua: extraver = string.gsub('-rc-final', '%-', ''); print(extraver) }
 
-%global		versiontag	2.2-rc-final
+%global		versiontag	2.2.0
 
 Name:		nfs-ganesha
 Version:	2.2.0
-Release:	0.13%{?dev_version:%{dev_version}}%{?dist}
+Release:	1%{?dev_version:%{dev_version}}%{?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%{versiontag}/%{name}-%{version}rc-final.tar.gz
+Source0:	https://github.com/%{name}/%{name}/archive/V%{versiontag}/%{name}-%{version}.tar.gz
 Patch0:		nfs-ganesha-2.2.0-CMakeLists.txt.patch
 
-%if ( 0%{?rhel} && 0%{?rhel} < 7 )
-BuildRequires:	cmake28
-%else
 BuildRequires:	cmake
-%endif
 BuildRequires:	bison flex
 BuildRequires:	flex
 BuildRequires:	pkgconfig
@@ -320,9 +316,6 @@ rm -rf contrib/libzfswrapper
 %patch0 -p1
 
 %build
-%if ( 0%{?rhel} && 0%{?rhel} < 7 )
-%global cmake %cmake28
-%endif
 %cmake ./src -DCMAKE_BUILD_TYPE=Debug			\
 	-DBUILD_CONFIG=rpmbuild				\
 	-DUSE_FSAL_ZFS=NO				\
@@ -570,6 +563,9 @@ mv %{buildroot}/usr%{_sysconfdir}/ganesha/ganesha.conf %{buildroot}%{_sysconfdir
 %endif
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index 4a73e8f..bb43945 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b52681780d9e6f571feee24270979c43  nfs-ganesha-2.2.0rc-final.tar.gz
+e2d8e66ab4f78e3ecf1582cfa26c7d37  nfs-ganesha-2.2.0.tar.gz

From b99a652a4c089aec610f9a0ef623acd2242d5128 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Fri, 15 May 2015 08:26:03 -0400
Subject: [PATCH 2/2] %license, build with glusterfs-3.7.0 GA

---
 nfs-ganesha.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index 99372f6..ed57dd0 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -76,7 +76,7 @@
 
 Name:		nfs-ganesha
 Version:	2.2.0
-Release:	1%{?dev_version:%{dev_version}}%{?dist}
+Release:	2%{?dev_version:%{dev_version}}%{?dist}
 Summary:	NFS-Ganesha is a NFS Server running in user space
 Group:		Applications/System
 License:	LGPLv3+
@@ -431,6 +431,7 @@ mv %{buildroot}/usr%{_sysconfdir}/ganesha/ganesha.conf %{buildroot}%{_sysconfdir
 %endif
 
 %files
+%license src/LICENSE.txt
 %defattr(-,root,root,-)
 %{_bindir}/ganesha.nfsd
 #%%{_bindir}/libntirpc.a
@@ -563,6 +564,9 @@ mv %{buildroot}/usr%{_sysconfdir}/ganesha/ganesha.conf %{buildroot}%{_sysconfdir
 %endif
 
 %changelog
+* Fri May 15 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-2
+- %license, build with glusterfs-3.7.0 GA
+
 * Tue Apr 21 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-1
 - 2.2.0 GA