RPM: update build scripts

15 files changed, 16 insertions, 132 deletions

diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index b61478d84..5eb757699 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -6,7 +6,8 @@
 
 PKGNAME="${1%/}"
 PKGNAME="${PKGNAME##*/}"
-TDE_VERSION="${2:-14.0.0}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
+PATH="$(cd $(dirname $0); pwd):${PATH}"
 
 SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION})
 VERSION=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION} || :)
diff --git a/redhat/build/configure_repository.sh b/redhat/build/configure_repository.sh
index d280319f0..5691cfc13 100755
--- a/redhat/build/configure_repository.sh
+++ b/redhat/build/configure_repository.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -x
 
-TDE_VERSION=${1:-14.0.0}
+TDE_VERSION="${1:-${TDE_VERSION:-14.0.5}}"
 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 244b140c5..82c4b6804 100755
--- a/redhat/build/gather_rpm_sources.sh
+++ b/redhat/build/gather_rpm_sources.sh
@@ -5,7 +5,7 @@
 
 PKGNAME="${1%/}"
 PKGNAME="${PKGNAME##*/}"
-TDE_VERSION="${2:-14.0.5}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
 TARGETDIR="${3:-/tmp/${PKGNAME}-${TDE_VERSION}}"
 DIST="$4"
 
diff --git a/redhat/build/get_latest_built_package_filename.sh b/redhat/build/get_latest_built_package_filename.sh
index a459ced19..048493bf2 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:-14.0.0}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
 
 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 44d3896b6..990ca873f 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:-14.0.0}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh
index b4626036e..d7e1ce37d 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:-14.0.0}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
 
 [ -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 6c41f0afa..00a468d49 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:-14.0.0}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh
index 2e30edc9b..aaac175da 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:-14.0.5}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
 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 fc3b1e085..fcc0fb5d7 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:-14.0.0}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
 
 [ -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 f82c3fde8..81c20b183 100755
--- a/redhat/build/get_specfile.sh
+++ b/redhat/build/get_specfile.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-14.0.5}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
-[ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR=~/tde/master/tde-packaging
-[ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR=${TDE_PACKAGING_DIR}/redhat
+[ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR="${HOME}/tde/${TDE_BRANCH:-master}/tde-packaging"
+[ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR="${TDE_PACKAGING_DIR}/redhat"
 
 # Special case for QT3
 if [ "${PKGNAME}" = "qt3" ]; then
diff --git a/redhat/build/is_latest_package_built.sh b/redhat/build/is_latest_package_built.sh
index 2054957e4..5ce0c83a9 100755
--- a/redhat/build/is_latest_package_built.sh
+++ b/redhat/build/is_latest_package_built.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-14.0.0}"
+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})
diff --git a/redhat/build/is_latest_package_installed.sh b/redhat/build/is_latest_package_installed.sh
index 7923eca50..1f600862f 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:-14.0.0}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
 
 INSTALLED=$(get_installed_package_version.sh ${PKGNAME} ${TDE_VERSION})
 TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})
diff --git a/redhat/build/is_rpm_built.sh b/redhat/build/is_rpm_built.sh
deleted file mode 100755
index 5cd4b0595..000000000
--- a/redhat/build/is_rpm_built.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash -x
-
-RPMDIR=$(rpm -E %_rpmdir)
diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh
index 1aa1eae5e..5db461319 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="${1:-14.0.0}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}"
 
 LOCKFILE="/tmp/lock.${0##*/}"
 while [ -e "${LOCKFILE}" ]; do
diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh
deleted file mode 100644
index 13304eb05..000000000
--- a/redhat/buildenv.sh
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/bash
-
-# This file can be sourced in your .bashrc
-
-BRANCH="$(git rev-parse --abbrev-ref HEAD)"
-TDE_BASEDIR="${HOME}/tde"
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5"
-TDE_GITBASESRC=${TDE_BASEDIR}/${BRANCH}/tde
-[ -d "${TDE_PACKAGING_DIR}" ] || export TDE_PACKAGING_DIR="${TDE_BASEDIR}/${BRANCH}/tde-packaging"
-TDE_GITBASEPKG="${TDE_PACKAGING_DIR}/redhat"
-TDE_TARBALLS="${TDE_BASEDIR}/tde-tarballs/${TDE_VERSION}"
-
-
-export PATH="${PATH}:${TDE_GITBASEPKG}/build"
-
-# Distribution suffix (e.g: .el6 , .mga3 ...)
-export DIST="$( "${TDE_GITBASEPKG}/build/rpmdist.sh" --dist )"
-
-# Go to the RPMS folder
-alias cdrpm='cd ${HOME}/rpmbuild/RPMS/RPMS${DIST}'
-
-# Build a single tarball (execute from GIT directory)
-alias tdp4='TARGET=${TDE_VERSION} SUFFIX=0 TARBALL_DIR=${TDE_TARBALLS}/main COMPRESS=gzip ${TDE_GITBASESRC}/scripts/create_tarball'
-
-# Rebuild all tarballs
-if [ -x /usr/bin/pigz ]; then
-  export TDE_COMPRESS=pigz
-else
-  export TDE_COMPRESS=gzip
-fi
-alias tdep3='(rm -rf ~/tde/tde-tarballs/3.5.13.2; cd ~/tde/tde_v3.5.13-sru; export SUFFIX=0; export COMPRESS=${TDE_COMPRESS:-gzip}; export TDE_REBRAND=1; ./scripts/create_all_tarballs)'
-alias tdep4='(cd ${TDE_GITBASESRC}; export SUFFIX=0; export COMPRESS=${TDE_COMPRESS:-gzip}; export TDE_REBRAND=1; ./scripts/create_all_tarballs)'
-
-# Build a single package
-alias cdp='cd $HOME/tde/tde-packaging/redhat'
-
-grp3() {
-  build_rpm_package.sh "${1}" "3.5.13.2"
-}
-
-grp4() {
-  build_rpm_package.sh "${1}" "${TDE_VERSION}"
-}
-
-# Check if tarballs are more recent than installed packages
-checknew() {
-  find ~/tde/tde-tarballs/${TDE_VERSION} -name "trinity-*.tar.gz" | while read f; do
-    TAR="${f##*/}"
-    NAME="${TAR%-*}"
-    
-    if rpm -q "${NAME}" &>/dev/null; then
-      set $(rpm -q --qf "%{name} ${TDE_VERSION} %{release}" ${NAME} )
-      B="$1-$2~${3#*_}"
-      A=${TAR%.tar.gz}
-      B=${B%.opt}
-      B=${B%${DIST}}
-      if [[ "$A" > "$B" ]]; then
-        echo "Installed: $B"
-        echo "Available: $A"
-        echo
-      fi
-    fi
-  done
-}
-
-
-do_optimizegraphics() {
-  if ! (which optipng && which advdef && which pngout) ; then
-    echo "Missing utility ! Check that 'optipng', 'advdef' and 'pngout' utilities are available !"
-    return 1
-  fi
-  
-  while read m; do
-    if [ -d "${m}" ]; then
-      pushd "${m}"
-      if [ -r .optimizegraphics ]; then
-        echo "Graphics are already optimized !"
-      else
-        optimizegraphics
-        touch .optimizegraphics
-      fi
-      popd
-    fi
-  done < submodules
-}
-
-alias rr='rpm -qa --qf "%{name}|%{buildhost}|%{packager}\n" | grep -e "\(\.vtf\|andriot\)"|cut -d"|" -f1 | sort'
-
-# Update main repository
-alias tdu='(export GIT_ASKPASS=/bin/true; cd ~/tde/tde_master; ./scripts/switch_all_submodules_to_head_and_clean)'
-
-# Build local repository metadata (Mageia)
-alias cru='(cdrpm; genhdlist2 --allow-empty-media noarch; genhdlist2 $(uname -i); sudo urpmi.update rpmbuild.$(uname -i) rpmbuild.noarch)'
-alias cruc='(cdrpm; genhdlist2 --clean --allow-empty-media  noarch; genhdlist2 --clean $(uname -i); sudo urpmi.update rpmbuild.$(uname -i) rpmbuild.noarch)'
-
-# Build local repository (RHEL)
-alias cry='(cdrpm; createrepo $(uname -i); createrepo noarch; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")'
-alias sy='sudo yum localinstall -y --nogpgcheck'
-
-# Build local repository (openSUSE)
-alias crz='(cdrpm; createrepo $(uname -i); createrepo noarch; sudo zypper refresh)'
-
-# Build local repository (PCLOS)
-alias cra='(cdrpm; genpkglist $PWD noarch; genpkglist $PWD i586; genpkglist $PWD x86_64; genbasedir $PWD i586 x86_64 noarch; sudo apt-get update)'
-alias crac='(cdrpm; for i in i586 noarch x86_64; do cd $i; tdesortrpm.sh; cd -; done; rpmsign --addsign */RPMS.*/*.rpm; for i in i586 noarch x86_64; do for j in 3rdparty applications dependencies extras libraries main; do genpkglist $PWD/$i $j; done; done; for i in i586 noarch x86_64; do genbasedir $PWD/$i 3rdparty applications dependencies extras libraries main; done; sudo apt-get update)'
-alias cras='(cdrpm; cd $(uname -i); rm -rf base; mkdir base; for i in 3rdparty applications dependencies extras libraries main; do genpkglist $PWD $i; done; genbasedir $PWD 3rdparty applications dependencies extras libraries main; cd ../noarch; rm -rf base; mkdir base; for i in applications dependencies extras main; do genpkglist $PWD $i; done; genbasedir $PWD applications dependencies extras main )'
-
-# Reinstall packages (Mageia)
-getrpmfromsrpm() {
-  rpm -qa --qf "%{name} %{sourcerpm}\n"|grep "$1"|awk '{print $1}'
-}
-reinst() {
-  sudo urpmi --replacepkgs --allow-force $(getrpmfromsrpm $1)
-}