From 7f790f695d457b930486f1981ffb252cc09a74b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Wed, 18 May 2022 21:29:06 +0200 Subject: RPM: update build scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- redhat/build/get_source_files.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'redhat/build/get_source_files.sh') diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh index d6c43b0e4..1b0463e4c 100755 --- a/redhat/build/get_source_files.sh +++ b/redhat/build/get_source_files.sh @@ -8,13 +8,12 @@ DIST="$3" SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION}) SPECDIR="${SPECFILE%/*}" RPMPKGNAME="$(get_rpm_package_name.sh ${PKGNAME})" - [ ! -r "${SPECFILE}" ] && exit 2 while read var val; do case "${var}" in Version:*) VERSION="${val}";; - Source[0-9]*:|Source:|Patch[0-9]*:) + Source*:|Source:|Patch[0-9]*:) FILE="${SPECDIR}/${val##*/}" if [ "${DIST}" = "any" ] && [ "${var//%\{?dist\}/}" = "${var}" ]; then FILES="${FILE//%\{?dist\}/.}"* @@ -23,12 +22,15 @@ while read var val; do fi for FILE in $FILES; do - file=$(rpm --define "tde_pkg ${PKGNAME}" \ - --define "tde_version ${TDE_VERSION}" \ - --define "name ${RPMPKGNAME}" \ - --define "version ${VERSION}" \ - --define "dist ${DIST:-$(rpm -E %dist)}" \ - -E "${FILE}") + for name in ${RPMPKGNAME} ${PKGNAME} trinity-${PKGNAME}; do + file=$(rpm --define "tde_pkg ${PKGNAME}" \ + --define "tde_version ${TDE_VERSION}" \ + --define "name ${name}" \ + --define "version ${VERSION}" \ + --define "dist ${DIST:-$(rpm -E %dist)}" \ + -E "${FILE}") + [ -r "${file}" ] && break + done [ -r "${file}" ] && echo "${file}" done ;; -- cgit v1.2.1