RPM packaging: update build scripts

redhat/Makefile.r14

@@ -1,7 +1,7 @@
 SHELL := /bin/bash
 PACKAGING_DIR := $(shell cd ..; pwd)
 PATH := $(PATH):$(shell pwd)/build
-TDE_VERSION := 14.0.2
+TDE_VERSION := 14.0.3
 
 buildpkg = \
   @echo "Now processing '$(1)' [from $(PACKAGING_DIR)]."; \

redhat/build/get_spec_version.sh

@@ -12,6 +12,7 @@ SPECFILE=$(get_specfile.sh  ${PKGNAME} ${TDE_VERSION})
 VERSION=$(sed -n "/^Version:/ s/Version:[ 	]*//p" ${SPECFILE})
 RELEASE=$(sed -n "/^Release:/ s/Release:[ 	]*//p" ${SPECFILE})
 VERSION=$(rpm -E "${VERSION}")
+VERSION=$(rpm --define "tde_version ${TDE_VERSION}" -E "${VERSION}")
 RELEASE=$(rpm --define "tde_version ${TDE_VERSION}" -E "${RELEASE}")
 RELEASE=${RELEASE%$(rpmdist.sh --dist)}
 

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 [ "${TARBALL/\~/}" != "${TARBALL}" ]; then
-  if [ "${INSTALLED#*\~}" = "${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

redhat/buildenv.sh

@@ -3,7 +3,7 @@
 # This file can be sourced in your .bashrc
 
 TDE_BASEDIR=~/tde
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.2"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.3"
 TDE_GITBASESRC=${TDE_BASEDIR}/tde_r14
 TDE_GITBASEPKG=${TDE_BASEDIR}/tde-packaging/redhat
 TDE_TARBALLS=${TDE_BASEDIR}/tde-tarballs/${TDE_VERSION}