From 5259ca7ff29406043491aa22851af6b7ce32a748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Fri, 8 Nov 2019 20:47:18 +0100
Subject: RPM: update build scripts

---
 redhat/docker/mga6/Dockerfile.x86_64 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'redhat/docker/mga6/Dockerfile.x86_64')

diff --git a/redhat/docker/mga6/Dockerfile.x86_64 b/redhat/docker/mga6/Dockerfile.x86_64
index b1e552139..b656182ec 100644
--- a/redhat/docker/mga6/Dockerfile.x86_64
+++ b/redhat/docker/mga6/Dockerfile.x86_64
@@ -24,6 +24,9 @@ RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAUL
 # Fix poppler include causing FTBFS
 RUN sed -i "/usr/include/poppler/PDFDoc.h" -e "/^#define PDFDOC_H/ s|$|\n#define nullptr NULL|"
 
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter
+
 # Add non-root user to build packages
 RUN rm -rf /home/trinity
 RUN useradd -m -s /bin/bash -u 1000 trinity
@@ -31,7 +34,7 @@ RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
 
 # Configure user trinity
 USER trinity
-ADD rpmmacros ${HOME}/.rpmmacros
+ADD rpmmacros /home/trinity/.rpmmacros
 
 # Add rpmbuild repositories
 RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
-- 
cgit v1.2.1