From 8016710153e7e230e86208d8e45c2a9d3f1b4425 Mon Sep 17 00:00:00 2001
From: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Date: Thu, 29 Apr 2021 03:49:00 -0400
Subject: [PATCH] SPDK 21.04

Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: Id0e3688cf81f2dac4de4ab6c5212f986776ade2f
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7685
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
---
 CHANGELOG.md           | 2 +-
 include/spdk/version.h | 2 +-
 pkg/spdk.spec          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f227ad3244..2a9e45e91a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## v21.04: (Upcoming Release)
+## v21.04: ZNS NVMe bdev, PMR, ADQ initiator, RPM
 
 ### accel
 
diff --git a/include/spdk/version.h b/include/spdk/version.h
index 5814028a99..43b904330d 100644
--- a/include/spdk/version.h
+++ b/include/spdk/version.h
@@ -59,7 +59,7 @@
 /**
  * Version string suffix.
  */
-#define SPDK_VERSION_SUFFIX	"-pre"
+#define SPDK_VERSION_SUFFIX	""
 
 /**
  * Single numeric value representing a version number for compile-time comparisons.
diff --git a/pkg/spdk.spec b/pkg/spdk.spec
index c6861081dd..2cbc75ec0e 100644
--- a/pkg/spdk.spec
+++ b/pkg/spdk.spec
@@ -2,12 +2,12 @@
 %bcond_with doc
 
 Name: spdk
-Version: master
+Version: 21.04
 Release: 0%{?dist}
 Epoch: 0
 URL: http://spdk.io
 
-Source: https://github.com/spdk/spdk/archive/master.tar.gz
+Source: https://github.com/spdk/spdk/archive/v21.04.tar.gz
 Summary: Set of libraries and utilities for high performance user-mode storage
 
 %define package_version %{epoch}:%{version}-%{release}