summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2015-12-31 20:52:20 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2015-12-31 20:52:20 +0100
commitf6e9b2b948aabfced76ea1901a0aec608c020c11 (patch)
treea4e40234488c38d8fa71bc10754097585896195a /redhat
parentcc979ff6d7f7c2bb91c4d9450b38ad25d3b89d72 (diff)
downloadtde-packaging-f6e9b2b948aabfced76ea1901a0aec608c020c11.tar.gz
tde-packaging-f6e9b2b948aabfced76ea1901a0aec608c020c11.zip
RPM packaging: update build scripts
Diffstat (limited to 'redhat')
-rw-r--r--redhat/Makefile.r142
-rwxr-xr-xredhat/build/get_spec_version.sh1
-rwxr-xr-xredhat/build/is_latest_package_installed.sh5
-rw-r--r--redhat/buildenv.sh2
4 files changed, 6 insertions, 4 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 3876bdd6c..351970855 100644
--- a/redhat/Makefile.r14
+++ b/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)]."; \
diff --git a/redhat/build/get_spec_version.sh b/redhat/build/get_spec_version.sh
index 0980fd239..fc3b1e085 100755
--- a/redhat/build/get_spec_version.sh
+++ b/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)}
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
diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh
index 705d479b8..1c36bcf6f 100644
--- a/redhat/buildenv.sh
+++ b/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}