From d036de9c62c1a4e74663a038fe6f1b31f6323375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Tue, 1 Jan 2019 22:56:56 +0100
Subject: RPM: update build scripts

---
 redhat/build/build_rpm_package.sh                 | 3 ++-
 redhat/build/configure_repository.sh              | 2 +-
 redhat/build/gather_rpm_sources.sh                | 2 +-
 redhat/build/get_latest_built_package_filename.sh | 2 +-
 redhat/build/get_latest_built_package_version.sh  | 2 +-
 redhat/build/get_latest_tarball_filename.sh       | 2 +-
 redhat/build/get_latest_tarball_version.sh        | 2 +-
 redhat/build/get_source_files.sh                  | 2 +-
 redhat/build/get_spec_version.sh                  | 2 +-
 redhat/build/get_specfile.sh                      | 6 +++---
 redhat/build/is_latest_package_built.sh           | 2 +-
 redhat/build/is_latest_package_installed.sh       | 2 +-
 redhat/build/is_rpm_built.sh                      | 3 ---
 redhat/build/update_repository.sh                 | 2 +-
 14 files changed, 16 insertions(+), 18 deletions(-)
 delete mode 100755 redhat/build/is_rpm_built.sh

(limited to 'redhat/build')

diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index b61478d84..5eb757699 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -6,7 +6,8 @@
 
 PKGNAME="${1%/}"
 PKGNAME="${PKGNAME##*/}"
-TDE_VERSION="${2:-14.0.0}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
+PATH="$(cd $(dirname $0); pwd):${PATH}"
 
 SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION})
 VERSION=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION} || :)
diff --git a/redhat/build/configure_repository.sh b/redhat/build/configure_repository.sh
index d280319f0..5691cfc13 100755
--- a/redhat/build/configure_repository.sh
+++ b/redhat/build/configure_repository.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -x
 
-TDE_VERSION=${1:-14.0.0}
+TDE_VERSION="${1:-${TDE_VERSION:-14.0.5}}"
 ARCH=$(rpm -E %_target_cpu)
 RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})
 
diff --git a/redhat/build/gather_rpm_sources.sh b/redhat/build/gather_rpm_sources.sh
index 244b140c5..82c4b6804 100755
--- a/redhat/build/gather_rpm_sources.sh
+++ b/redhat/build/gather_rpm_sources.sh
@@ -5,7 +5,7 @@
 
 PKGNAME="${1%/}"
 PKGNAME="${PKGNAME##*/}"
-TDE_VERSION="${2:-14.0.5}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
 TARGETDIR="${3:-/tmp/${PKGNAME}-${TDE_VERSION}}"
 DIST="$4"
 
diff --git a/redhat/build/get_latest_built_package_filename.sh b/redhat/build/get_latest_built_package_filename.sh
index a459ced19..048493bf2 100755
--- a/redhat/build/get_latest_built_package_filename.sh
+++ b/redhat/build/get_latest_built_package_filename.sh
@@ -2,7 +2,7 @@
 
 PKGNAME="$1"
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
-TDE_VERSION="${2:-14.0.0}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
 
 RPMDIR="$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})"
 RPMDIR_ARCH="${RPMDIR}/$(rpm -E %_target_cpu)"
diff --git a/redhat/build/get_latest_built_package_version.sh b/redhat/build/get_latest_built_package_version.sh
index 44d3896b6..990ca873f 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:-14.0.0}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh
index b4626036e..d7e1ce37d 100755
--- a/redhat/build/get_latest_tarball_filename.sh
+++ b/redhat/build/get_latest_tarball_filename.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-14.0.0}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 [ -d "${TARBALLS_DIR}" ] || TARBALLS_DIR=~/tde/tarballs/${TDE_VERSION}/
diff --git a/redhat/build/get_latest_tarball_version.sh b/redhat/build/get_latest_tarball_version.sh
index 6c41f0afa..00a468d49 100755
--- a/redhat/build/get_latest_tarball_version.sh
+++ b/redhat/build/get_latest_tarball_version.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-14.0.0}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh
index 2e30edc9b..aaac175da 100755
--- a/redhat/build/get_source_files.sh
+++ b/redhat/build/get_source_files.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-14.0.5}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
 DIST="$3"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
diff --git a/redhat/build/get_spec_version.sh b/redhat/build/get_spec_version.sh
index fc3b1e085..fcc0fb5d7 100755
--- a/redhat/build/get_spec_version.sh
+++ b/redhat/build/get_spec_version.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-14.0.0}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
diff --git a/redhat/build/get_specfile.sh b/redhat/build/get_specfile.sh
index f82c3fde8..81c20b183 100755
--- a/redhat/build/get_specfile.sh
+++ b/redhat/build/get_specfile.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-14.0.5}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
-[ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR=~/tde/master/tde-packaging
-[ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR=${TDE_PACKAGING_DIR}/redhat
+[ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR="${HOME}/tde/${TDE_BRANCH:-master}/tde-packaging"
+[ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR="${TDE_PACKAGING_DIR}/redhat"
 
 # Special case for QT3
 if [ "${PKGNAME}" = "qt3" ]; then
diff --git a/redhat/build/is_latest_package_built.sh b/redhat/build/is_latest_package_built.sh
index 2054957e4..5ce0c83a9 100755
--- a/redhat/build/is_latest_package_built.sh
+++ b/redhat/build/is_latest_package_built.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-14.0.0}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
 
 BUILT=$(get_latest_built_package_version.sh ${PKGNAME} ${TDE_VERSION})
 TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})
diff --git a/redhat/build/is_latest_package_installed.sh b/redhat/build/is_latest_package_installed.sh
index 7923eca50..1f600862f 100755
--- a/redhat/build/is_latest_package_installed.sh
+++ b/redhat/build/is_latest_package_installed.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-14.0.0}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
 
 INSTALLED=$(get_installed_package_version.sh ${PKGNAME} ${TDE_VERSION})
 TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})
diff --git a/redhat/build/is_rpm_built.sh b/redhat/build/is_rpm_built.sh
deleted file mode 100755
index 5cd4b0595..000000000
--- a/redhat/build/is_rpm_built.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash -x
-
-RPMDIR=$(rpm -E %_rpmdir)
diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh
index 1aa1eae5e..5db461319 100755
--- a/redhat/build/update_repository.sh
+++ b/redhat/build/update_repository.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 WORKERS=$(getconf _NPROCESSORS_ONLN)
-TDE_VERSION="${1:-14.0.0}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
 
 LOCKFILE="/tmp/lock.${0##*/}"
 while [ -e "${LOCKFILE}" ]; do
-- 
cgit v1.2.1