RPM: update build scripts

15 files changed, 36 insertions, 25 deletions

diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index 5eb757699..5f4d659a2 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -1,12 +1,12 @@
 #!/bin/bash -ex
 
 # Usage: build_rpm_package.sh <TDE_PACKAGE> [TDE_VERSION]
-# Example: build_rpm_package.sh tdebase 14.0.0
+# Example: build_rpm_package.sh tdebase 14.0.7
 
 
 PKGNAME="${1%/}"
 PKGNAME="${PKGNAME##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}"
 PATH="$(cd $(dirname $0); pwd):${PATH}"
 
 SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION})
diff --git a/redhat/build/configure_repository.sh b/redhat/build/configure_repository.sh
index 5691cfc13..7723a1651 100755
--- a/redhat/build/configure_repository.sh
+++ b/redhat/build/configure_repository.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -x
 
-TDE_VERSION="${1:-${TDE_VERSION:-14.0.5}}"
+TDE_VERSION="${1:-${TDE_VERSION:-14.0.7}}"
 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 82c4b6804..6159a2bf0 100755
--- a/redhat/build/gather_rpm_sources.sh
+++ b/redhat/build/gather_rpm_sources.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 # Usage: gather_rpm_sources.sh <TDE_PACKAGE> <TDE_VERSION> <DESTINATION>
-# Example: gather_rpm_sources.sh tdebase 14.0.0 /tmp/tdebase
+# Example: gather_rpm_sources.sh tdebase 14.0.7 /tmp/tdebase
 
 PKGNAME="${1%/}"
 PKGNAME="${PKGNAME##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}"
 TARGETDIR="${3:-/tmp/${PKGNAME}-${TDE_VERSION}}"
 DIST="$4"
 
diff --git a/redhat/build/get_installed_package_version.sh b/redhat/build/get_installed_package_version.sh
index 4df81b12b..83db3ab12 100755
--- a/redhat/build/get_installed_package_version.sh
+++ b/redhat/build/get_installed_package_version.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Sample package name: trinity-tdelibs-14.0.0-0_pre727+6be06b3d.mga3.opt
+# Sample package name: trinity-tdelibs-14.0.7-0_pre727+6be06b3d.mga3.opt
 
 PKGNAME="${1##*/}"
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
diff --git a/redhat/build/get_latest_built_package_filename.sh b/redhat/build/get_latest_built_package_filename.sh
index 048493bf2..c25897907 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:-${TDE_VERSION:-14.0.5}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}"
 
 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 990ca873f..ecd45b197 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:-${TDE_VERSION:-14.0.5}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
@@ -9,9 +9,18 @@ RPM=$(get_latest_built_package_filename.sh "${PKGNAME}" ${TDE_VERSION})
 
 [ ! -r "${RPM}" ] && echo "No package found for '${PKGNAME}' !" && exit 2
 
-VERSION=$(rpm -qp --qf "%{version}-%{release}" "${RPM}")
-VERSION=${VERSION%.opt} # Remove '.opt' suffix
-VERSION=${VERSION%.[a-z]*} # Remove distro suffix (e.g. '.el6')
-VERSION=${VERSION/-*_0_/\~}
+pkg_version="$(rpm -qp --qf "%{version}" "${RPM}")"
+pkg_release="$(rpm -qp --qf "%{release}" "${RPM}")"
 
-echo $VERSION
+# Application packages: version does not match TDE version
+if [[ "${pkg_release}" =~ _0_ ]]; then
+  eval VERSION="${pkg_release/_0_/\~}"
+else
+  # Base package (tdelibs ...)
+  eval VERSION="${pkg_version}${pkg_release/0_/\~}"
+fi
+
+VERSION="${VERSION%.opt}" # Remove '.opt' suffix
+VERSION="${VERSION%.[a-z]*}" # Remove distro suffix (e.g. '.el6')
+
+echo "${VERSION}"
diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh
index 895516a2a..0cfd80047 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.6}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}"
 
 [ -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 c06f5a4a1..dd3448765 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.6}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}"
 
 [ -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 cde3d430b..8a010993e 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -24,7 +24,7 @@ case "${PKGNAME}" in
   # 3rd party dependencies
   "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="";;
+  "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2"|"yaz") PREFIX="";;
   # Other
   "curl") PREFIX="trinity-lib";;
   # Default case: add prefix
@@ -63,6 +63,7 @@ case "${PKGNAME}" in
   "tqca-tls")         PKGRUNTIME="${lib}tqt3-mt-tqca-tls";;
   "tqt3")             PKGRUNTIME="${lib}tqt3-mt";;
   "tqtinterface")     PKGRUNTIME="${lib}tqt4";;
+  "yaz")              PKGRUNTIME="${lib}yaz";;
   # Language package: install only French language package
   "k3b-i18n"|"koffice-i18n"|"tde-i18n")
                       PKGRUNTIME="${PKGNAME}-French";;
@@ -111,6 +112,7 @@ if [ -n "${DEVEL}" ]; then
     "tqca")        PKGDEVEL="${lib}tqca-devel";;
     "tqscintilla") PKGDEVEL="${lib}tqscintilla-devel";;
     "tqt3")        PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers ${lib}tqt3-mt-sqlite3";;
+    "yaz")         PKGDEVEL="${lib}yaz-devel";;
     # Default case: development package has same name as runtime package, plus '-devel' suffix.
     *)             PKGDEVEL="${PKGRUNTIME}-devel";;
   esac
diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh
index aaac175da..8b2a74c1a 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:-${TDE_VERSION:-14.0.5}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}"
 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 fcc0fb5d7..d92060c5c 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:-${TDE_VERSION:-14.0.5}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}"
 
 [ -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 81c20b183..62eb01144 100755
--- a/redhat/build/get_specfile.sh
+++ b/redhat/build/get_specfile.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
diff --git a/redhat/build/is_latest_package_built.sh b/redhat/build/is_latest_package_built.sh
index 5792905d9..a373ba021 100755
--- a/redhat/build/is_latest_package_built.sh
+++ b/redhat/build/is_latest_package_built.sh
@@ -1,17 +1,17 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}"
 
-BUILT=$(get_latest_built_package_version.sh ${PKGNAME} ${TDE_VERSION})
+BUILT="$(get_latest_built_package_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
+if [ "${BUILT/~/}" != "${BUILT}" ]; then
+  if [ "${BUILT#*_pre}" = "${TARBALL#*~pre}" ]; then
     echo "Latest development package '${PKGNAME}' version '${BUILT}' is already built."
     exit 0
   fi
diff --git a/redhat/build/is_latest_package_installed.sh b/redhat/build/is_latest_package_installed.sh
index 1f600862f..3bd6e2662 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:-${TDE_VERSION:-14.0.5}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}"
 
 INSTALLED=$(get_installed_package_version.sh ${PKGNAME} ${TDE_VERSION})
 TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})
diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh
index 5db461319..d6b711656 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="${2:-${TDE_VERSION:-14.0.5}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}"
 
 LOCKFILE="/tmp/lock.${0##*/}"
 while [ -e "${LOCKFILE}" ]; do