RPM: update build scripts

redhat/Makefile.r14

@@ -1,7 +1,8 @@
 SHELL := /bin/bash
 PACKAGING_DIR := $(shell cd ..; pwd)
 PATH := $(PATH):$(shell pwd)/build
-TDE_VERSION := 14.0.3
+TDE_VERSION := 14.0.4
+DIST := $(shell rpm -E %dist)
 
 buildpkg = \
   @echo "Now processing '$(1)' [from $(PACKAGING_DIR)]."; \

redhat/build/get_rpm_package_name.sh

@@ -85,7 +85,7 @@ if [ -n "${DEVEL}" ]; then
 
   # Some other packags NOT having development package
   case "${PKGNAME}" in
-    "cmake"|"cscope"|"hal-info"|"lilypond"|"mftrace"|"pcsc-perl"|"rdiff-backup"|"torsocks") exit 0;;
+    "autoconf"|"cmake"|"cscope"|"hal-info"|"lilypond"|"mftrace"|"pcsc-perl"|"rdiff-backup"|"torsocks") exit 0;;
     "tqca-tls"|"tdeadmin"|"tdetoys"|"tde-i18n"*|"tdeaddons"|"tdeartwork"|"libtqt-perl"|"kipi-plugins") exit 0;;
   esac
 
@@ -116,4 +116,3 @@ if [ -n "${DEVEL}" ]; then
   # Finally, other packages do have a '-devel'
   echo "${PREFIX}${PKGDEVEL}"
 fi
-

redhat/docker/pclinuxos/genla.sh

@@ -60,4 +60,5 @@ dlpreopen=''
 libdir='${LIBDIR}'
 EOF
 
-sudo mv "/tmp/$LIB.$$" "${FILE}"
+[ $(whoami) = "root" ] || SUDO="sudo"
+$SUDO mv "/tmp/$LIB.$$" "${FILE}"

redhat/docker/run.sh

@@ -14,7 +14,7 @@ mkdir -p "${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}"
 mkdir -p "${HOME}/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION}"
 mkdir -p "/dev/shm/docker"
 
-docker run -t -i \
+docker run -t -i --rm \
   -h "${IMAGE}" \
   -v /dev/shm/docker:/tmp:z \
   -u trinity \