From 04cea6bd12bc162e9cdad004864e1dc0a4e779a9 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openwaygroup.com>
Date: Wed, 2 Mar 2022 19:47:38 +0300
Subject: [PATCH] Fixed packaging versions

---
 CMakeLists.txt            | 3 ++-
 cmake/InstallLayout.cmake | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16030e72ee8..38158c69e2b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,7 +97,7 @@ else()
     set(FDB_VERSION "${PROJECT_VERSION}-${BUILD_VERSION}")
 endif()
 set(FDB_VERSION_PLAIN ${FDB_VERSION})
-string(REPLACE "." ";" FDB_VERSION_LIST ${FDB_VERSION_PLAIN})
+string(REPLACE "." ";" FDB_VERSION_LIST ${PROJECT_VERSION})
 list(GET FDB_VERSION_LIST 0 FDB_MAJOR)
 list(GET FDB_VERSION_LIST 1 FDB_MINOR)
 list(GET FDB_VERSION_LIST 2 FDB_PATCH)
@@ -107,6 +107,7 @@ file(WRITE ${CMAKE_BINARY_DIR}/version.txt ${FDB_VERSION})
 
 message(STATUS "FDB package name is ${FDB_PACKAGE_NAME}")
 message(STATUS "FDB version is ${FDB_VERSION}")
+message(STATUS "FDB_PATCH is ${FDB_PATCH}")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fdbclient/versions.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/fdbclient/versions.h)
 
 
diff --git a/cmake/InstallLayout.cmake b/cmake/InstallLayout.cmake
index 7b0126ccda8..2ec1a713f9d 100644
--- a/cmake/InstallLayout.cmake
+++ b/cmake/InstallLayout.cmake
@@ -230,7 +230,7 @@ set(CPACK_RPM_SERVER-EL7_PRE_UNINSTALL_SCRIPT_FILE
   ${CMAKE_SOURCE_DIR}/packaging/rpm/scripts/preunserver.sh)
 
 set(CPACK_RPM_SERVER-EL7_PACKAGE_REQUIRES
-  "foundationdb-clients = ${FDB_MAJOR}.${FDB_MINOR}.${FDB_PATCH}")
+  "foundationdb-clients = ${FDB_VERSION}")
 
 set(CPACK_RPM_SERVER-VERSIONED_POST_INSTALL_SCRIPT_FILE
   ${CMAKE_BINARY_DIR}/packaging/multiversion/server/postinst-rpm)