summaryrefslogtreecommitdiffstats
path: root/redhat/build
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/build')
-rwxr-xr-xredhat/build/build_rpm_package.sh4
-rwxr-xr-xredhat/build/configure_repository.sh2
-rwxr-xr-xredhat/build/gather_rpm_sources.sh4
-rwxr-xr-xredhat/build/get_installed_package_version.sh2
-rwxr-xr-xredhat/build/get_latest_built_package_filename.sh2
-rwxr-xr-xredhat/build/get_latest_built_package_version.sh21
-rwxr-xr-xredhat/build/get_latest_tarball_filename.sh38
-rwxr-xr-xredhat/build/get_latest_tarball_version.sh2
-rwxr-xr-xredhat/build/get_rpm_package_name.sh14
-rwxr-xr-xredhat/build/get_source_files.sh2
-rwxr-xr-xredhat/build/get_spec_version.sh2
-rwxr-xr-xredhat/build/get_specfile.sh2
-rwxr-xr-xredhat/build/install_rpm_package.sh2
-rwxr-xr-xredhat/build/is_latest_package_built.sh14
-rwxr-xr-xredhat/build/is_latest_package_installed.sh4
-rwxr-xr-xredhat/build/update_repository.sh2
16 files changed, 57 insertions, 60 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..869efc93b 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_ ]] || [[ "${pkg_release}" =~ ${TDE_VERSION}_ ]] ; 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 d7e1ce37d..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.5}}"
+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}/
@@ -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..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.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_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 2989aebef..d0945f13b 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -22,9 +22,9 @@ 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"|"libbeagle"|"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"|"brp-check-trinity"|"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
@@ -45,11 +45,13 @@ 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";;
"lcms") PKGRUNTIME="${lib}lcms1";;
"libart-lgpl") PKGRUNTIME="${lib}art_lgpl_2-2";;
+ "libbeagle") PKGRUNTIME="${lib}beagle1";;
"libcaldav") PKGRUNTIME="${lib}caldav0";;
"libcarddav") PKGRUNTIME="${lib}carddav0";;
"libkdcraw") PKGRUNTIME="${lib}kdcraw4";;
@@ -62,6 +64,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";;
@@ -93,11 +96,13 @@ 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";;
+ "libbeagle") PKGDEVEL="${lib}beagle-devel";;
"libcaldav") PKGDEVEL="${lib}caldav-devel";;
"libcarddav") PKGDEVEL="${lib}carddav-devel";;
"libkdcraw") PKGDEVEL="${lib}kdcraw-devel";;
@@ -109,6 +114,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/install_rpm_package.sh b/redhat/build/install_rpm_package.sh
index 5deece1bd..156d02aec 100755
--- a/redhat/build/install_rpm_package.sh
+++ b/redhat/build/install_rpm_package.sh
@@ -11,7 +11,7 @@ PKGNAME="${1}"
if [ -x /usr/sbin/urpmi ]; then
PKGINST='sudo urpmi --auto --no-verify-rpm'
elif [ -x /usr/bin/dnf ]; then
- PKGINST="sudo dnf install -y --refresh --nogpgcheck"
+ PKGINST="sudo dnf install -y --nogpgcheck"
elif [ -x /usr/bin/zypper ]; then
PKGINST="sudo zypper install -y"
elif [ -x /usr/bin/yum ]; then
diff --git a/redhat/build/is_latest_package_built.sh b/redhat/build/is_latest_package_built.sh
index 5ce0c83a9..2acb98a6a 100755
--- a/redhat/build/is_latest_package_built.sh
+++ b/redhat/build/is_latest_package_built.sh
@@ -1,21 +1,23 @@
#!/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})
-TARBALL=$(get_latest_tarball_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
# Nominal case: no "~" caracter
else
- if [ "${TARBALL%-*}" = "${BUILT%-*}" ] || [[ "${BUILT}" =~ [0-9\.]*-${TARBALL}_[0-9]* ]]; then
+ if [ "${TARBALL%-*}" = "${BUILT%-*}" ] || [[ "${BUILT}" =~ ${TARBALL}_[0-9]* ]]; then
echo "Latest stable 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..811cbafa0 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})
@@ -20,7 +20,7 @@ else
echo "Latest package '${PKGNAME}' version '${INSTALLED}' is already built and installed."
exit 0
fi
-
+
# Other package (e.g. QT3)
if [ "${INSTALLED}" = "${SPEC}" ] || [ "${INSTALLED}$(rpm -E %dist)" = "${SPEC}" ]; then
echo "Latest package '${PKGNAME}' version '${INSTALLED}' is already built and installed."
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 22:15:06 +0000