RPM: update packages to build on Fedora 30, Mageia 7

4 files changed, 18 insertions, 34 deletions

diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh
index d7e1ce37d..895516a2a 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:-${TDE_VERSION:-14.0.5}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.6}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 [ -d "${TARBALLS_DIR}" ] || TARBALLS_DIR=~/tde/tarballs/${TDE_VERSION}/
@@ -10,33 +10,13 @@ TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
 
 EXTRA_DIR="$(cd ${TARBALLS_DIR}/../extras/; pwd)"
 
-RET=$(find "${TARBALLS_DIR}" -name "trinity-${PKGNAME}-${TDE_VERSION}*.tar.gz" | sort -V | tail -n 1)
-[ -r "${RET}" ] && echo "${RET}" && exit 0
-
-RET=$(find "${TARBALLS_DIR}" "${EXTRA_DIR}" -follow -name "${PKGNAME}-${TDE_VERSION}*.tar.gz" -o -name "trinity-${PKGNAME}-${TDE_VERSION}*.tar.gz" | sort -V | tail -n 1)
-[ -r "${RET}" ] && echo "${RET}" && exit 0
-
-RET=$(find "${TARBALLS_DIR}" -name "trinity-${PKGNAME}-[0-9]*.tar.gz" | sort -V | tail -n 1)
-[ -r "${RET}" ] && echo "${RET}" && exit 0
-
-RET=$(find "${EXTRA_DIR}" -follow -name "${PKGNAME}[-_][0-9]*.tar.*" | sort -V | tail -n 1)
-[ -r "${RET}" ] && echo "${RET}" && exit 0
-
-# Now look in the 'tde-packaging' directory
-RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -V | tail -n 1)
-[ -r "${RET}" ] && echo "${RET}" && exit 0
-
-# Retry without 'trinity-*', and allow any TAR extension.
-RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -V | tail -n 1)
-[ -r "${RET}" ] && echo "${RET}" && exit 0
-
-# Retry without 'trinity-*', and allow any TAR extension.
-RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -V | tail -n 1)
-[ -r "${RET}" ] && echo "${RET}" && exit 0
-
-# Retry by removing numbers in package name, e.g "imlib1" => "imlib"
-RET=$(find "${DIST_PACKAGING_DIR}" -name "$(tr -d "[0-9]" <<< ${PKGNAME})-[0-9]*.tar*" | sort -V | tail -n 1)
-[ -r "${RET}" ] && echo "${RET}" && exit 0
-
+RET=""
+for dir in "${TARBALLS_DIR}" "${EXTRA_DIR}" "${DIST_PACKAGING_DIR}"; do
+  for v in "${PKGNAME}-${TDE_VERSION}*.tar.*" "trinity-${PKGNAME}-${TDE_VERSION}*.tar.*" "${PKGNAME}[-_][0-9]*.tar.*"; do
+    RET=$(find "${dir}" -follow -type f -name ${v} | sort -V | tail -n 1)
+    [ -r "${RET}" ] && break
+  done
+  [ -r "${RET}" ] && echo "${RET}" && break
+done
 
 exit 0
diff --git a/redhat/build/get_latest_tarball_version.sh b/redhat/build/get_latest_tarball_version.sh
index 00a468d49..c06f5a4a1 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:-${TDE_VERSION:-14.0.5}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.6}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 2989aebef..cde3d430b 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -22,7 +22,7 @@ case "${PKGNAME}" in
   # Most TDE dependencies have no prefix
   "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcaldav"|"libcarddav"|"python-tqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface"|"tqca"|"tqca-tls") PREFIX="";;
   # 3rd party dependencies
-  "cscope"|"dirmngr"|"esound"|"exempi"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"mp4v2"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";;
+  "cscope"|"dirmngr"|"esound"|"exempi"|"exiv2"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"mp4v2"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";;
   # Extra build stuff
   "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
   # Other
@@ -45,6 +45,7 @@ case "${PKGNAME}" in
   "dbus-1-tqt")       PKGRUNTIME="${lib}dbus-1-tqt0";;
   "digikam")          PKGRUNTIME="digikam-i18n";;
   "esound")           PKGRUNTIME="${lib}esd0";;
+  "exiv2")            PKGRUNTIME="${lib}exiv2_26";;
   "imlib1")           PKGRUNTIME="${lib}Imlib1";;
   "knetworkmanager8") PKGRUNTIME="knetworkmanager";;
   "koffice")          PKGRUNTIME="koffice-suite";;
@@ -93,10 +94,11 @@ if [ -n "${DEVEL}" ]; then
     "avahi-tqt")   PKGDEVEL="libavahi-tqt-devel";;
     "dbus-tqt")    PKGDEVEL="libdbus-tqt-1-devel";;
     "dbus-1-tqt")  PKGDEVEL="libdbus-1-tqt-devel";;
-    "esound")      PKGDEVEL="libesd-devel";;
+    "esound")      PKGDEVEL="libesd0-devel";;
+    "exiv2")       PKGDEVEL="${lib}exiv2-devel-0.26";;
     "imlib1")      PKGDEVEL="${lib}Imlib-devel";;
     "koffice")     PKGDEVEL="koffice-devel";;
-    "lcms")        PKGDEVEL="liblcms-devel";;
+    "lcms")        PKGDEVEL="${lib}lcms-devel";;
     "libart-lgpl") PKGDEVEL="libart_lgpl-devel";;
     "libcaldav")   PKGDEVEL="${lib}caldav-devel";;
     "libcarddav")  PKGDEVEL="${lib}carddav-devel";;
diff --git a/redhat/build/is_latest_package_built.sh b/redhat/build/is_latest_package_built.sh
index 5ce0c83a9..5792905d9 100755
--- a/redhat/build/is_latest_package_built.sh
+++ b/redhat/build/is_latest_package_built.sh
@@ -4,9 +4,11 @@ PKGNAME="${1##*/}"
 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})
+TARBALL="$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})"
 RPM_PKGNAME="$(get_rpm_package_name.sh ${PKGNAME})"
 
+[ -z "${TARBALL}" ] && exit 1
+
 # If package version contains a "~": it's a pre-release
 if [ "${BUILT/\~/}" != "${BUILT}" ]; then
   if [ "${BUILT#*\~}" = "${TARBALL#*\~}" ]; then