From 2b420c10eeaf1afc65b462b7834290fb28e8c0de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 29 Apr 2021 12:02:06 +0200
Subject: [PATCH] RPM: update docker scripts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: François Andriot <albator78@libertysurf.fr>
---
 redhat/docker/el8/packages          | 3 +++
 redhat/docker/f33/Dockerfile.x86_64 | 8 ++++++++
 redhat/docker/f33/packages          | 1 +
 3 files changed, 12 insertions(+)

diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages
index 08e696e2a..adaf170b0 100644
--- a/redhat/docker/el8/packages
+++ b/redhat/docker/el8/packages
@@ -16,6 +16,7 @@ cdparanoia-devel
 chrpath
 clamav
 clamav-devel
+cln-devel
 clucene-core-devel
 cmake
 cpp
@@ -103,6 +104,7 @@ libogg-devel
 libotr-devel
 libpaper-devel
 libpcap-devel
+libqalculate-devel
 libraw1394-devel
 librsvg2-tools
 librsync-devel
@@ -214,4 +216,5 @@ wireless-tools-devel
 xine-lib-devel
 xmlto
 xorg-x11-font-utils
+xscreensaver
 xz-devel
diff --git a/redhat/docker/f33/Dockerfile.x86_64 b/redhat/docker/f33/Dockerfile.x86_64
index bcd6a1b19..4bd74cf4a 100644
--- a/redhat/docker/f33/Dockerfile.x86_64
+++ b/redhat/docker/f33/Dockerfile.x86_64
@@ -20,7 +20,15 @@ RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${T
 # Fix utempter detection
 RUN chmod a+r /usr/libexec/utempter/utempter
 
+RUN chmod 777 /tmp
+
 # Add non-root user to build packages
 RUN useradd -m -s /bin/bash -u 1000 trinity \
  && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+
+USER trinity
 COPY rpmmacros /home/trinity/.rpmmacros
+
+RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/33/Everything/source/tree/Packages/p/python-exif-2.2.1-1.fc33.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/python-exif.spec --define "py2 1" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/noarch/python2-exif-*
diff --git a/redhat/docker/f33/packages b/redhat/docker/f33/packages
index d0532b160..2839b6997 100644
--- a/redhat/docker/f33/packages
+++ b/redhat/docker/f33/packages
@@ -192,6 +192,7 @@ postgresql-server-devel
 ppp
 pulseaudio-libs-devel
 python
+python2-setuptools
 python3-devel
 qt4-devel
 recode