Branch: r14.0.x

c39ca964 2018-12-02 20:48:19 François Andriot 
RPM: update build scripts
M redhat/build/gather_rpm_sources.sh
M redhat/build/get_latest_tarball_filename.sh
M redhat/build/get_specfile.sh
M redhat/buildenv.sh

redhat/build/gather_rpm_sources.sh

diff --git a/redhat/build/gather_rpm_sources.sh b/redhat/build/gather_rpm_sources.sh
index f6b7253..244b140 100755
--- a/redhat/build/gather_rpm_sources.sh
+++ b/redhat/build/gather_rpm_sources.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 # Usage: gather_rpm_sources.sh <TDE_PACKAGE> <TDE_VERSION> <DESTINATION>
 # Example: gather_rpm_sources.sh tdebase 14.0.0 /tmp/tdebase
@@ -30,7 +30,7 @@
 
 ### Check for patches
 
-PATCHDIR="${HOME}/tde/tde-patches/${TDE_VERSION}/$1"
+PATCHDIR="${HOME}/tde/patches/${TDE_VERSION}/$1"
 if [ -d "${PATCHDIR}" ]; then
   cat "${PATCHDIR}/"*".patch" >>"${TARGETDIR}/one.patch"
   sed -i "${TARGETDIR}/"*".spec" \

redhat/build/get_latest_tarball_filename.sh

diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh
index 7901d09..7e8059b 100755
--- a/redhat/build/get_latest_tarball_filename.sh
+++ b/redhat/build/get_latest_tarball_filename.sh
@@ -10,32 +10,32 @@
 
 EXTRA_DIR="$(cd ${TARBALLS_DIR}/../extras/; pwd)"
 
-RET=$(find "${TARBALLS_DIR}" -name "trinity-${PKGNAME}-${TDE_VERSION}*.tar.gz" | sort -n | tail -n 1)
+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" | sort -n | tail -n 1)
+RET=$(find "${TARBALLS_DIR}" "${EXTRA_DIR}" -follow -name "${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 -n | tail -n 1)
+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 -n | tail -n 1)
+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 -n | tail -n 1)
+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 -n | tail -n 1)
+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 -n | tail -n 1)
+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 -n | tail -n 1)
+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

redhat/build/get_specfile.sh

diff --git a/redhat/build/get_specfile.sh b/redhat/build/get_specfile.sh
index b7336ff..92fbd7d 100755
--- a/redhat/build/get_specfile.sh
+++ b/redhat/build/get_specfile.sh
@@ -25,10 +25,12 @@
   "trinity-${PKGNAME}.spec" \
 ; do
   SPECFILE="$(find "${DIST_PACKAGING_DIR}" -follow -name "${filename}")"
-  if [ -r "${SPECFILE}" ]; then
-    echo "${SPECFILE}"
-    exit 0
-  fi
+  [ -r "${SPECFILE}" ] && break || continue
 done
 
-exit 1
+if [ -r "${SPECFILE}" ]; then
+  echo "${SPECFILE}"
+  exit 0
+else
+  exit 1
+fi

redhat/buildenv.sh

diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh
index 029f29a..13304eb 100644
--- a/redhat/buildenv.sh
+++ b/redhat/buildenv.sh
@@ -2,13 +2,14 @@
 
 # This file can be sourced in your .bashrc
 
-TDE_BASEDIR=~/tde
+BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+TDE_BASEDIR="${HOME}/tde"
 [ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5"
-TDE_GITBASESRC=${TDE_BASEDIR}/tde.master
-TDE_GITBASEPKG=${TDE_BASEDIR}/tde-packaging.master/redhat
-TDE_TARBALLS=${TDE_BASEDIR}/tde-tarballs/${TDE_VERSION}
+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}"
 
-[ -d "${TDE_PACKAGING_DIR}" ] || export TDE_PACKAGING_DIR=~/tde/tde-packaging.master
 
 export PATH="${PATH}:${TDE_GITBASEPKG}/build"
 
@@ -16,7 +17,7 @@
 export DIST="$( "${TDE_GITBASEPKG}/build/rpmdist.sh" --dist )"
 
 # Go to the RPMS folder
-alias cdrpm='cd ~/rpmbuild/RPMS/RPMS${DIST}'
+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'
@@ -31,7 +32,7 @@
 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 ~/tde/tde-packaging/redhat'
+alias cdp='cd $HOME/tde/tde-packaging/redhat'
 
 grp3() {
   build_rpm_package.sh "${1}" "3.5.13.2"
808b8606 2018-12-02 20:48:19 François Andriot 
RPM: update docker build script for opensuse tumbleweed
M redhat/docker/osstw/packages
M redhat/docker/run.sh

redhat/docker/osstw/packages

diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages
index f1cb04d..cf03ada 100644
--- a/redhat/docker/osstw/packages
+++ b/redhat/docker/osstw/packages
@@ -62,6 +62,7 @@
 less
 libacl-devel
 libart_lgpl-devel
+libattr-devel
 libavahi-devel
 libavcodec-devel
 libblkid-devel

redhat/docker/run.sh

diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh
index 30faba0..128c537 100755
--- a/redhat/docker/run.sh
+++ b/redhat/docker/run.sh
@@ -21,9 +21,11 @@
   -u trinity \
   -e TMPPATH=/tmp \
   -e TDE_VERSION=${TDE_VERSION} \
-  -w /home/trinity/tde/tde-packaging/redhat \
+  -w /home/trinity/tde/tde-packaging.r14.0.x/redhat \
   -v ${HOME}/.gnupg:/home/trinity/.gnupg \
-  -v ${HOME}/tde/tde-packaging:/home/trinity/tde/tde-packaging \
+  -v ${HOME}/tde/tde-packaging.r14.0.x:/home/trinity/tde/tde-packaging.r14.0.x \
+  -v ${HOME}/tde/tde-packaging.master:/home/trinity/tde/tde-packaging.master \
+  -v ${HOME}/tde/tde-patches:/home/trinity/tde/tde-patches \
   -v ${HOME}/tde/tde-tarballs:/home/trinity/tde/tde-tarballs \
   -v ${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}:/home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION} \
   -v ${HOME}/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION}:/home/trinity/rpmbuild/SRPMS.tde-${TDE_VERSION} \
093decc2 2018-12-02 20:48:19 François Andriot 
RPM: remove obsolete spec file
R redhat/extras/akode/akode-14.0.0.spec

redhat/extras/akode/akode-14.0.0.spec

diff --git a/redhat/extras/akode/akode-14.0.0.spec b/redhat/extras/akode/akode-14.0.0.spec
deleted file mode 100644
index 18c1cfa..0000000
--- a/redhat/extras/akode/akode-14.0.0.spec
+++ /dev/null
@@ -1,335 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-Summary: 	Audio-decoding framework 
-Name:		trinity-akode 
-Version:	2.0.2
-Release:	6%{?dist}%{?_variant}
-
-License:	LGPLv2+
-Group: 		System Environment/Libraries
-#URL:		http://carewolf.com/akode/  
-URL:		http://www.kde-apps.org/content/show.php?content=30375
-
-Source0:	akode-14.0.0.tar.gz
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-
-# FLAC support
-%define _with_flac --with-flac
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: libflac-devel
-%else
-BuildRequires: %{_lib}flac-devel
-%endif
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: flac-devel
-%endif
-
-# JACK support
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define _with_jack --with-jack
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}jack-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: jack-audio-connection-kit-devel
-%endif
-%endif
-
-# SAMPLERATE support
-%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define _with_libsamplerate --with-libsamplerate
-BuildRequires: libsamplerate-devel
-%endif
-
-# PULSEAUDIO support
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define _with_pulseaudio --with-pulseaudio
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}pulseaudio-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: pulseaudio-libs-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: pulseaudio-devel
-%endif
-%endif
-
-# MAD support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-%define _with_libmad --with-libmad
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:		%{_lib}mad-devel
-%endif
** Diff limit reached (max: 250 lines) **