summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2017-06-24 20:57:05 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2017-06-24 20:57:05 +0200
commit381e1237361c29c6082eefb019023a3e8b791632 (patch)
tree6f69b272167d513ae2e891303952e322151fb26e /redhat
parent16248b3ebc930f96eeb9d0f1b173b955d718bcfd (diff)
downloadtde-packaging-381e1237361c29c6082eefb019023a3e8b791632.tar.gz
tde-packaging-381e1237361c29c6082eefb019023a3e8b791632.zip
RPM: update build scripts
Diffstat (limited to 'redhat')
-rwxr-xr-xredhat/build/build_rpm_package.sh9
-rwxr-xr-xredhat/build/get_rpm_package_name.sh4
2 files changed, 8 insertions, 5 deletions
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index 127b3a070..27508d1d7 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -15,9 +15,10 @@ VERSION=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION} || :)
case "${VERSION}" in *~pre*) PREVERSION="${VERSION#*~}";; esac
DIST="$(rpmdist.sh --dist)"
-BUILDDIR="/dev/shm/BUILD${DIST}.$(uname -i)"
-BUILDROOTDIR="/dev/shm/BUILDROOT${DIST}.$(uname -i)"
-LOGFILE=/tmp/log.${COMP##*/}
+[ -z "${TMPPATH}" ] && TMPPATH="/dev/shm"
+BUILDDIR="${TMPPATH}/BUILD${DIST}.$(uname -i)"
+BUILDROOTDIR="${TMPPATH}/BUILDROOT${DIST}.$(uname -i)"
+LOGFILE="${TMPPATH}/log.${COMP##*/}"
TEMPDIR="$(mktemp -d)"
cp -f ${SPECFILE} ${SOURCES} ${TARBALL} "${TEMPDIR}"
@@ -42,7 +43,7 @@ rpmbuild -ba \
--define "_sourcedir ${TEMPDIR}" \
--define "_builddir ${BUILDDIR}" \
--define "_buildrootdir ${BUILDROOTDIR}" \
- --define "_tmppath /dev/shm" \
+ --define "_tmppath ${TMPPATH}" \
--define "_rpmdir ${RPMDIR}" \
--define "_srcrpmdir ${SRPMDIR}" \
--define '_build_create_debug 1' \
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index bf1f34ffb..4167b8f2a 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -24,7 +24,7 @@ case "${PKGNAME}" in
# Most TDE libraries have no prefix
#"libkdcraw") PREFIX="";;
# 3rd party dependencies
- "dirmngr"|"esound"|"exempi"|"file"|"fileshareset"|"hk_classes"|"lcms"|"python-qt3"|"tar") PREFIX="";;
+ "dirmngr"|"esound"|"exempi"|"file"|"fileshareset"|"hk_classes"|"lcms"|"mp4v2"|"python-qt3"|"tar") PREFIX="";;
# Extra build stuff
"autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
# Other
@@ -57,6 +57,7 @@ case "${PKGNAME}" in
"libkexiv2") PKGRUNTIME="${lib}kexiv2-5";;
"libkipi") PKGRUNTIME="${lib}kipi0";;
"libr") PKGRUNTIME="${lib}r";;
+ "mp4v2") PKGRUNTIME="${lib}mp4v2";;
"tqscintilla") PKGRUNTIME="${lib}tqscintilla7";;
"tqca") PKGRUNTIME="${lib}tqca1";;
"tqca-tls") PKGRUNTIME="${lib}tqt3-mt-tqca-tls";;
@@ -103,6 +104,7 @@ if [ -n "${DEVEL}" ]; then
"libkexiv2") PKGDEVEL="${lib}kexiv2-devel";;
"libkipi") PKGDEVEL="${lib}kipi-devel";;
"libr") PKGDEVEL="${lib}r-devel";;
+ "mp4v2") PKGDEVEL="${lib}mp4v2-devel";;
"pan") PKGDEVEL="uulib-devel";;
"tqca") PKGDEVEL="${lib}tqca-devel";;
"tqscintilla") PKGDEVEL="${lib}tqscintilla-devel";;