From d70a3eb8f8aa6e619a1efeabc30253864102ab4f Mon Sep 17 00:00:00 2001
From: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date: Nov 12 2019 14:59:38 +0000
Subject: nfs-ganesha 3.0 GA


Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>

---

diff --git a/SOURCES/0001-src-cmake-modules-FindNTIRPC.cmake.patch b/SOURCES/0001-src-cmake-modules-FindNTIRPC.cmake.patch
deleted file mode 100644
index fc78c70..0000000
--- a/SOURCES/0001-src-cmake-modules-FindNTIRPC.cmake.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- nfs-ganesha-3.0-rc5/src/cmake/modules/FindNTIRPC.cmake.orig	2019-11-04 11:24:09.034634008 -0500
-+++ nfs-ganesha-3.0-rc5/src/cmake/modules/FindNTIRPC.cmake	2019-11-04 11:24:52.407505064 -0500
-@@ -62,14 +62,14 @@
- 	string(REGEX REPLACE ".*#[ \t]*define[ \t]*NTIRPC_VERSION[ \t]*\"([^\n]*)\".*" "\\1" match "${header}")
- 	set(NTIRPC_VERSION "${match}")
- else()
--	set(NTIRPC_VERSION "0.0.0")
-+	set(NTIRPC_VERSION "3.0.0")
- endif()
- 
- # handle the QUIETLY and REQUIRED arguments and set PRELUDE_FOUND to TRUE if
- # all listed variables are TRUE
- include(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(NTIRPC
--	REQUIRED_VARS NTIRPC_INCLUDE_DIR NTIRPC_LIBRARY NTIRPC_LTTNG
-+	REQUIRED_VARS NTIRPC_INCLUDE_DIR NTIRPC_LIBRARY
- 	VERSION_VAR NTIRPC_VERSION)
- # VERSION FPHSA options not handled by CMake version < 2.8.2)
- #                                  VERSION_VAR)
diff --git a/SOURCES/0002-src-CMakeLists.txt.patch b/SOURCES/0002-src-CMakeLists.txt.patch
deleted file mode 100644
index f7f43e6..0000000
--- a/SOURCES/0002-src-CMakeLists.txt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nfs-ganesha-3.0-rc5/src/CMakeLists.txt.orig	2019-11-04 13:14:45.976923250 -0500
-+++ nfs-ganesha-3.0-rc5/src/CMakeLists.txt	2019-11-04 13:15:20.058607707 -0500
-@@ -1024,7 +1024,7 @@
-     set(NTIRPC_LIBRARY ${NTIRPC_LIBRARY} ntirpc_lttng)
-   endif (USE_LTTNG)
-   set(NTIRPC_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/libntirpc/ntirpc/")
--  message(STATUS "Using ntirpc submodule")
-+  message(STATUS "Using ntirpc submodule, NTIRPC_INCLUDE_DIR=${NTIRPC_INCLUDE_DIR}")
- endif (USE_SYSTEM_NTIRPC)
- message(${NTIRPC_INCLUDE_DIR})
- include_directories(${NTIRPC_INCLUDE_DIR})
diff --git a/SPECS/nfs-ganesha.spec b/SPECS/nfs-ganesha.spec
index c5247ff..4d4a453 100644
--- a/SPECS/nfs-ganesha.spec
+++ b/SPECS/nfs-ganesha.spec
@@ -130,19 +130,17 @@ Requires: openSUSE-release
 %endif
 
 %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 rc5
-%global dash_dev_version 3.0-rc5
+# %%global	dev rc5
+# %%global dash_dev_version 3.0-rc5
 
 Name:		nfs-ganesha
 Version:	3.0
-Release:	0.2%{?dev:%{dev}}%{?dist}
+Release:	1%{?dev:-%{dev}}%{?dist}
 Summary:	NFS-Ganesha is a NFS Server running in user space
 License:	LGPLv3+
 Url:		https://github.com/nfs-ganesha/nfs-ganesha/wiki
 
-Source0:	https://github.com/%{name}/%{name}/archive/V%{dash_dev_version}/%{name}-%{dash_dev_version}.tar.gz
-Patch1:		0001-src-cmake-modules-FindNTIRPC.cmake.patch
-Patch2:		0002-src-CMakeLists.txt.patch 
+Source0:	https://github.com/%{name}/%{name}/archive/V%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:	cmake
 BuildRequires:	bison
@@ -521,9 +519,7 @@ Development headers and auxiliary files for developing with %{name}.
 %endif
 
 %prep
-%setup -q -n %{name}-%{dash_dev_version}
-%patch1 -p1
-%patch2 -p1
+%setup -q -n %{name}-%{version}
 
 %build
 cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo	\
@@ -903,6 +899,12 @@ exit 0
 %endif
 
 %changelog
+* Tue Nov 12 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.0-1
+- nfs-ganesha 3.0 GA
+
+* Tue Nov 5 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.0-0.3rc5
+- nfs-ganesha 3.0 RC5, nfs4_recovery.c
+
 * Tue Nov 5 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.0-0.2rc5
 - nfs-ganesha 3.0 RC5, w/ fsal_mem