diff options
| author | François Andriot <albator78@libertysurf.fr> | 2017-11-05 20:36:04 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2017-11-05 20:36:04 +0100 |
| commit | f604d2d72f45d13aeb1706c855624e40a43a602b (patch) | |
| tree | ac955ccbf464cfded46a1498fb29808127e31a13 | |
| parent | 488d11495027a75355bebe4ad16497b336dbf404 (diff) | |
| download | tde-packaging-f604d2d72f45d13aeb1706c855624e40a43a602b.tar.gz tde-packaging-f604d2d72f45d13aeb1706c855624e40a43a602b.zip | |
RPM: update build scripts
| -rw-r--r-- | redhat/Makefile.r14 | 3 | ||||
| -rwxr-xr-x | redhat/build/get_rpm_package_name.sh | 5 | ||||
| -rwxr-xr-x | redhat/docker/pclinuxos/genla.sh | 3 | ||||
| -rwxr-xr-x | redhat/docker/run.sh | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index ffd1575f0..352b2a343 100644 --- a/redhat/Makefile.r14 +++ b/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)]."; \ diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index 3fa65ebcb..f29d37968 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/redhat/build/get_rpm_package_name.sh @@ -82,10 +82,10 @@ if [ -n "${DEVEL}" ]; then # Extras packages do NOT have 'devel' package, except Akode "extras") if [ "${PKGNAME}" != "akode" ] && [ "${PKGNAME}" != "hk_classes" ]; then exit 0; fi;; esac - + # 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 - diff --git a/redhat/docker/pclinuxos/genla.sh b/redhat/docker/pclinuxos/genla.sh index b909b0601..ecc7ac98f 100755 --- a/redhat/docker/pclinuxos/genla.sh +++ b/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}" diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh index b1f2621ef..b8138d8c3 100755 --- a/redhat/docker/run.sh +++ b/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 \ |