From 3640fbfa138be5c1ac3b8b84d8a813886a48dfe1 Mon Sep 17 00:00:00 2001
From: Mauro Sardara <msardara@cisco.com>
Date: Mon, 5 Oct 2020 09:46:52 +0200
Subject: [HICN-643] Fix get_next_version_script and version numbers.

Signed-off-by: Mauro Sardara <msardara@cisco.com>
Change-Id: Ib1118a4b8d25209aa9dd8335ee900a326daac45b
---
 ctrl/facemgr/cmake/Modules/Packaging.cmake         | 4 ++--
 ctrl/libhicnctrl/cmake/Modules/Packaging.cmake     | 8 ++++----
 ctrl/sysrepo-plugins/cmake/Modules/Packaging.cmake | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'ctrl')

diff --git a/ctrl/facemgr/cmake/Modules/Packaging.cmake b/ctrl/facemgr/cmake/Modules/Packaging.cmake
index bb406a423..3a7e5a85c 100644
--- a/ctrl/facemgr/cmake/Modules/Packaging.cmake
+++ b/ctrl/facemgr/cmake/Modules/Packaging.cmake
@@ -21,11 +21,11 @@ set(${FACEMGR}_DESCRIPTION
 )
 
 set(${FACEMGR}_DEB_DEPENDENCIES
-  "libconfig9, libevent-dev, lib${LIBHICNCTRL} (= stable_version)"
+  "libconfig9, libevent-dev, lib${LIBHICNCTRL} (>= stable_version)"
   CACHE STRING "Dependencies for deb/rpm package."
 )
 
 set(${FACEMGR}_RPM_DEPENDENCIES
-  "libconfig, libevent-devel, lib${LIBHICNCTRL} = stable_version"
+  "libconfig, libevent-devel, lib${LIBHICNCTRL} >= stable_version"
   CACHE STRING "Dependencies for deb/rpm package."
 )
diff --git a/ctrl/libhicnctrl/cmake/Modules/Packaging.cmake b/ctrl/libhicnctrl/cmake/Modules/Packaging.cmake
index bbacd0bc0..92e9d4adb 100644
--- a/ctrl/libhicnctrl/cmake/Modules/Packaging.cmake
+++ b/ctrl/libhicnctrl/cmake/Modules/Packaging.cmake
@@ -32,7 +32,7 @@ if (BUILD_HICNPLUGIN AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
   )
 
   set(${LIBHICNCTRL_COMPONENT}-dev_DEB_DEPENDENCIES
-    "${LIBHICNCTRL_COMPONENT} (= stable_version), hicn-plugin-dev (= stable_version)"
+    "${LIBHICNCTRL_COMPONENT} (>= stable_version), hicn-plugin-dev (>= stable_version-release), hicn-plugin-dev (<< next_version-release)"
     CACHE STRING "Dependencies for deb/rpm package."
   )
 
@@ -42,7 +42,7 @@ if (BUILD_HICNPLUGIN AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
   )
 
   set(${LIBHICNCTRL_COMPONENT}-dev_RPM_DEPENDENCIES
-    "${LIBHICNCTRL_COMPONENT} = stable_version, hicn-plugin-dev = stable_version"
+    "${LIBHICNCTRL_COMPONENT} >= stable_version, hicn-plugin-dev >= stable_version-release, hicn-plugin-dev < next_version-release"
     CACHE STRING "Dependencies for deb/rpm package."
   )
 
@@ -53,7 +53,7 @@ else ()
   )
 
   set(${LIBHICNCTRL_COMPONENT}-dev_DEB_DEPENDENCIES
-    "${LIBHICNCTRL_COMPONENT} (= stable_version)"
+    "${LIBHICNCTRL_COMPONENT} (>= stable_version)"
     CACHE STRING "Dependencies for deb/rpm package."
   )
 
@@ -63,7 +63,7 @@ else ()
   )
 
   set(${LIBHICNCTRL_COMPONENT}-dev_RPM_DEPENDENCIES
-    "${LIBHICNCTRL_COMPONENT} = stable_version"
+    "${LIBHICNCTRL_COMPONENT} >= stable_version"
     CACHE STRING "Dependencies for deb/rpm package."
 )
 endif()
\ No newline at end of file
diff --git a/ctrl/sysrepo-plugins/cmake/Modules/Packaging.cmake b/ctrl/sysrepo-plugins/cmake/Modules/Packaging.cmake
index 49854ec2a..323c9d01a 100644
--- a/ctrl/sysrepo-plugins/cmake/Modules/Packaging.cmake
+++ b/ctrl/sysrepo-plugins/cmake/Modules/Packaging.cmake
@@ -21,11 +21,11 @@ set(hicn-sysrepo-plugin_DESCRIPTION
 )
 
 set(hicn-sysrepo-plugin_DEB_DEPENDENCIES
-  "hicn-plugin (= stable_version), sysrepo (>= 1.0)"
+  "hicn-plugin (>= stable_version-release), sysrepo (>= 1.0)"
   CACHE STRING "Dependencies for deb/rpm package."
 )
 
 set(hicn-sysrepo-plugin_RPM_DEPENDENCIES
-  "hicn-plugin = stable_version, sysrepo >= 1.0"
+  "hicn-plugin >= stable_version-release, sysrepo >= 1.0"
   CACHE STRING "Dependencies for deb/rpm package."
 )
-- 
cgit 1.2.3-korg