RPM: update build scripts

1 files changed, 15 insertions, 6 deletions

diff --git a/redhat/build/get_latest_built_package_version.sh b/redhat/build/get_latest_built_package_version.sh
index 990ca873f..ecd45b197 100755
--- a/redhat/build/get_latest_built_package_version.sh
+++ b/redhat/build/get_latest_built_package_version.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="$1"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
@@ -9,9 +9,18 @@ RPM=$(get_latest_built_package_filename.sh "${PKGNAME}" ${TDE_VERSION})
 
 [ ! -r "${RPM}" ] && echo "No package found for '${PKGNAME}' !" && exit 2
 
-VERSION=$(rpm -qp --qf "%{version}-%{release}" "${RPM}")
-VERSION=${VERSION%.opt} # Remove '.opt' suffix
-VERSION=${VERSION%.[a-z]*} # Remove distro suffix (e.g. '.el6')
-VERSION=${VERSION/-*_0_/\~}
+pkg_version="$(rpm -qp --qf "%{version}" "${RPM}")"
+pkg_release="$(rpm -qp --qf "%{release}" "${RPM}")"
 
-echo $VERSION
+# Application packages: version does not match TDE version
+if [[ "${pkg_release}" =~ _0_ ]]; then
+  eval VERSION="${pkg_release/_0_/\~}"
+else
+  # Base package (tdelibs ...)
+  eval VERSION="${pkg_version}${pkg_release/0_/\~}"
+fi
+
+VERSION="${VERSION%.opt}" # Remove '.opt' suffix
+VERSION="${VERSION%.[a-z]*}" # Remove distro suffix (e.g. '.el6')
+
+echo "${VERSION}"