From e0e9cbe466c1488a245ba028645a6f897b9ea02c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 29 Nov 2018 21:39:49 +0100
Subject: RPM: update build scripts

---
 redhat/build/gather_rpm_sources.sh | 9 ++++-----
 redhat/buildenv.sh                 | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'redhat')

diff --git a/redhat/build/gather_rpm_sources.sh b/redhat/build/gather_rpm_sources.sh
index 98b67cbdc..f6b7253dc 100755
--- a/redhat/build/gather_rpm_sources.sh
+++ b/redhat/build/gather_rpm_sources.sh
@@ -1,8 +1,7 @@
-#!/bin/bash
-
-# Usage: build_rpm_package.sh <TDE_PACKAGE> [TDE_VERSION]
-# Example: build_rpm_package.sh tdebase 14.0.0
+#!/bin/bash -x
 
+# Usage: gather_rpm_sources.sh <TDE_PACKAGE> <TDE_VERSION> <DESTINATION>
+# Example: gather_rpm_sources.sh tdebase 14.0.0 /tmp/tdebase
 
 PKGNAME="${1%/}"
 PKGNAME="${PKGNAME##*/}"
@@ -31,7 +30,7 @@ cp -f ${SPECFILE} ${SOURCES} ${TARBALL} "${TARGETDIR}"
 
 ### Check for patches
 
-PATCHDIR="${SPECFILE%/*}/patches/${TDE_VERSION}"
+PATCHDIR="${HOME}/tde/tde-patches/${TDE_VERSION}/$1"
 if [ -d "${PATCHDIR}" ]; then
   cat "${PATCHDIR}/"*".patch" >>"${TARGETDIR}/one.patch"
   sed -i "${TARGETDIR}/"*".spec" \
diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh
index 02f4e19f8..029f29afa 100644
--- a/redhat/buildenv.sh
+++ b/redhat/buildenv.sh
@@ -4,11 +4,11 @@
 
 TDE_BASEDIR=~/tde
 [ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5"
-TDE_GITBASESRC=${TDE_BASEDIR}/tde_master
-TDE_GITBASEPKG=${TDE_BASEDIR}/tde-packaging/redhat
+TDE_GITBASESRC=${TDE_BASEDIR}/tde.master
+TDE_GITBASEPKG=${TDE_BASEDIR}/tde-packaging.master/redhat
 TDE_TARBALLS=${TDE_BASEDIR}/tde-tarballs/${TDE_VERSION}
 
-[ -d "${TDE_PACKAGING_DIR}" ] || export TDE_PACKAGING_DIR=~/tde/tde-packaging
+[ -d "${TDE_PACKAGING_DIR}" ] || export TDE_PACKAGING_DIR=~/tde/tde-packaging.master
 
 export PATH="${PATH}:${TDE_GITBASEPKG}/build"
 
-- 
cgit v1.2.3