From f6e9b2b948aabfced76ea1901a0aec608c020c11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 31 Dec 2015 20:52:20 +0100
Subject: RPM packaging: update build scripts

---
 redhat/build/is_latest_package_installed.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'redhat/build/is_latest_package_installed.sh')

diff --git a/redhat/build/is_latest_package_installed.sh b/redhat/build/is_latest_package_installed.sh
index ab04bd8f7..7923eca50 100755
--- a/redhat/build/is_latest_package_installed.sh
+++ b/redhat/build/is_latest_package_installed.sh
@@ -8,8 +8,9 @@ TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})
 SPEC=$(get_spec_version.sh ${PKGNAME} ${TDE_VERSION})
 
 # Package containing "~" (e.g. R14 preversion tarballs):
-if [ "${INSTALLED/\~/}" != "${INSTALLED}" ]; then
-  if [ "${INSTALLED#*\~}" = "${TARBALL#*\~}" ]; then
+if [ "${TARBALL/\~/}" != "${TARBALL}" ]; then
+  # Only compare the part after '~'
+  if [ "${INSTALLED##*_}" = "${TARBALL#*\~}" ] ||[ "${INSTALLED#*\~}" = "${TARBALL#*\~}" ]; then
     echo "Latest package '${PKGNAME}' version '${TARBALL}' is already built and installed."
     exit 0
   fi
-- 
cgit v1.2.1