From 8ceca2c5a815a5443fa4ea3e65cdca2b0f0e95fa Mon Sep 17 00:00:00 2001
From: DanB <danb@cgrates.org>
Date: Tue, 12 May 2020 13:45:13 +0200
Subject: [PATCH] Version to 0.10.1 and spec cleanup for rpm

---
 data/ansible/rpm_packages/cgrates.spec.j2 | 2 +-
 data/ansible/rpm_packages/main.yaml       | 7 ++++++-
 utils/consts.go                           | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/data/ansible/rpm_packages/cgrates.spec.j2 b/data/ansible/rpm_packages/cgrates.spec.j2
index c10389ef4..8bd864724 100644
--- a/data/ansible/rpm_packages/cgrates.spec.j2
+++ b/data/ansible/rpm_packages/cgrates.spec.j2
@@ -1,5 +1,5 @@
 {{ ansible_managed | comment }}
-%global version 0.10.1~dev
+%global version 0.10.1
 
 %define debug_package  %{nil}
 %global _logdir	       /var/log/%name
diff --git a/data/ansible/rpm_packages/main.yaml b/data/ansible/rpm_packages/main.yaml
index 201266bc4..dddd358f5 100644
--- a/data/ansible/rpm_packages/main.yaml
+++ b/data/ansible/rpm_packages/main.yaml
@@ -233,6 +233,11 @@
       set_fact:
         releaseTag: ""
 
+    - name: Compose the ReleaseTag with Tag
+      set_fact:
+        releaseTag: "{{ gitTagVar.stdout_lines[0] }}"
+      when: gitTagVar.stdout_lines|length > 0
+
     - name: Compose the ReleaseTag with values
       set_fact:
         releaseTag: "{{ gitDate.stdout_lines[0] }}+{{ gitShortVersion.stdout_lines[0] }}"
@@ -346,7 +351,7 @@
       become: yes
       file:
         src: /var/packages/rpm/{{ cgrates_distribution }}/{{ item }}
-        dest: /var/packages/rpm/{{ cgrates_distribution }}/cgrates_current.rpm"
+        dest: /var/packages/rpm/{{ cgrates_distribution }}/cgrates_current.rpm
         state: link
       with_items: "{{ hostvars['yum']['rmpFileName']['stdout_lines'] }}"
       when : cgrates_distribution == "nightly" or hostvars['yum']['gitTagVar'].stdout_lines|length > 0
diff --git a/utils/consts.go b/utils/consts.go
index 672abac02..09ea2574c 100755
--- a/utils/consts.go
+++ b/utils/consts.go
@@ -136,7 +136,7 @@ var (
 
 const (
 	CGRateS                      = "CGRateS"
-	VERSION                      = "v0.10.1~dev"
+	VERSION                      = "v0.10.1"
 	DIAMETER_FIRMWARE_REVISION   = 918
 	REDIS_MAX_CONNS              = 10
 	CGRATES                      = "cgrates"