RPM: synchronize redhat directory with r14.1.x branch

Signed-off-by: François Andriot <albator78@libertysurf.fr>

5 files changed, 38 insertions, 49 deletions

diff --git a/redhat/docker/mga9/Dockerfile.i686 b/redhat/docker/mga9/Dockerfile.i686
index 46d2810d9..1811d8f52 100644
--- a/redhat/docker/mga9/Dockerfile.i686
+++ b/redhat/docker/mga9/Dockerfile.i686
@@ -1,38 +1,36 @@
-FROM mageia32:8
+FROM mageia32:9
 
-ARG TDE_VERSION=14.0.13
+ARG TDE_VERSION=14.1.2
 ARG ARCH=i686
 
 # Reset URPMI repositories to default
 # Enable more URPMI repositories
-RUN urpmi.removemedia -a \
- && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/i586/ \
- && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release  {/{p;N;d}" -e "/Tainted\\\ Updates  {/{p;N;d}"
-
 # Enable english locales
-RUN urpmi --replacepkgs glibc \
- && localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || :
-
 # Update distribution
 # Install Trinity build dependencies
 COPY packages.${ARCH} /packages
-RUN urpmi.update -a \
+RUN set -x \
+ && urpmi.removemedia -a \
+ && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/i586/ \
+ && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release  {/{p;N;d}" -e "/Tainted\\\ Updates  {/{p;N;d}" \
+ && urpmi.update -a \
+ && urpmi --replacepkgs glibc \
+ && localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || : \
  && urpmi --auto-select --auto \
  && urpmi --auto $(</packages)
 
 # Enable ccache
-RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
-
 # Fix utempter detection
-RUN chmod a+r /usr/libexec/utempter/utempter
-
 # Fix poppler support
-RUN sed -i "/usr/include/poppler/poppler-config.h" -e "/define HAVE_SPLASH/ s|^|//|"
+RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" \
+ && chmod a+r /usr/libexec/utempter/utempter \
+ && sed -i "/usr/include/poppler/poppler-config.h" -e "/define HAVE_SPLASH/ s|^|//|"
 
 # Add non-root user to build packages
 RUN rm -rf /home/trinity \
  && useradd -m -s /bin/bash -u 1000 trinity \
- && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" \
+ && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc
 
 # Configure user trinity
 USER trinity
@@ -45,7 +43,3 @@ RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
  && mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
  && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
  && sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
-
-# Build development packages that are missing
-RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/perl-PAR-Packer-1.51.0-2.mga8.src.rpm \
- && sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm"
diff --git a/redhat/docker/mga9/Dockerfile.x86_64 b/redhat/docker/mga9/Dockerfile.x86_64
index 9d4ef301e..450334eec 100644
--- a/redhat/docker/mga9/Dockerfile.x86_64
+++ b/redhat/docker/mga9/Dockerfile.x86_64
@@ -1,38 +1,36 @@
 FROM mageia:9
 
-ARG TDE_VERSION=14.0.13
+ARG TDE_VERSION=14.1.2
 ARG ARCH=x86_64
 
 # Reset URPMI repositories to default
 # Enable more URPMI repositories
-RUN urpmi.removemedia -a \
- && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/x86_64/ \
- && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release  {/{p;N;d}" -e "/Tainted\\\ Updates  {/{p;N;d}"
-
 # Enable english locales
-RUN urpmi --replacepkgs glibc \
- && localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || :
-
 # Update distribution
 # Install Trinity build dependencies
 COPY packages.${ARCH} /packages
-RUN urpmi.update -a \
+RUN set -x \
+ && urpmi.removemedia -a \
+ && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/x86_64/ \
+ && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release  {/{p;N;d}" -e "/Tainted\\\ Updates  {/{p;N;d}" \
+ && urpmi.update -a \
+ && urpmi --replacepkgs glibc \
+ && localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || : \
  && urpmi --auto-select --auto \
  && urpmi --auto $(</packages)
 
 # Enable ccache
-RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
-
 # Fix utempter detection
-RUN chmod a+r /usr/libexec/utempter/utempter
-
 # Fix poppler support
-RUN sed -i "/usr/include/poppler/poppler-config.h" -e "/define HAVE_SPLASH/ s|^|//|"
+RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" \
+ && chmod a+r /usr/libexec/utempter/utempter \
+ && sed -i "/usr/include/poppler/poppler-config.h" -e "/define HAVE_SPLASH/ s|^|//|"
 
 # Add non-root user to build packages
 RUN rm -rf /home/trinity \
  && useradd -m -s /bin/bash -u 1000 trinity \
- && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" \
+ && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc
 
 # Configure user trinity
 USER trinity
@@ -45,7 +43,3 @@ RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
  && mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
  && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
  && sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
-
-# Build development packages that are missing
-RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/perl-PAR-Packer-1.51.0-2.mga8.src.rpm \
- && sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm"
diff --git a/redhat/docker/mga9/packages.i686 b/redhat/docker/mga9/packages.i686
index a39a701af..01f51270c 100644
--- a/redhat/docker/mga9/packages.i686
+++ b/redhat/docker/mga9/packages.i686
@@ -71,7 +71,6 @@ libapr-devel
 libapr-util-devel
 libart_lgpl-devel
 libattr-devel
-libavformat58
 libbinutils-devel
 libblkid-devel
 libcdda-devel
@@ -122,16 +121,17 @@ libmad-devel
 libmad-devel
 libmng-devel
 libmp3lame-devel
+libmusicbrainz5-devel
 libmp4v2-devel
 libmpcdec-devel
 libmtp-devel
-libmusicbrainz-devel
 libnjb-devel
 libnpth-devel
 libofx-devel
 libotr-devel
 libpaper-devel
 libpaper-devel
+libpcre-devel
 libpkcs11-helper-devel
 libpoppler-devel
 libpulseaudio-devel
@@ -218,8 +218,7 @@ polkit-devel
 postgresql13
 postgresql13-devel
 ppp
-python-devel
-python-sip
+python3-devel
 qt4-devel
 readline-devel
 recode
@@ -231,7 +230,6 @@ scons
 SDL-devel
 speex-devel
 sqlite3-devel
-sqlite-devel
 sshfs-fuse
 subversion-devel
 sudo
diff --git a/redhat/docker/mga9/packages.x86_64 b/redhat/docker/mga9/packages.x86_64
index 998e0c682..21c9a7d60 100644
--- a/redhat/docker/mga9/packages.x86_64
+++ b/redhat/docker/mga9/packages.x86_64
@@ -69,7 +69,6 @@ karma-sharp
 kde-dev-scripts
 lib64apr-devel
 lib64apr-util-devel
-lib64avformat58
 lib64binutils-devel
 lib64boost_python3-devel
 lib64cln-devel
@@ -96,8 +95,10 @@ lib64jpeg-devel
 lib64lua-devel
 lib64mad-devel
 lib64mp3lame-devel
+lib64musicbrainz5-devel
 lib64npth-devel
 lib64paper-devel
+lib64pcre-devel
 lib64pkcs11-helper-devel
 lib64poppler-devel
 lib64pulseaudio-devel
@@ -150,7 +151,6 @@ libmng-devel
 libmp4v2-devel
 libmpcdec-devel
 libmtp-devel
-libmusicbrainz-devel
 libnjb-devel
 libofx-devel
 libotr-devel
@@ -193,6 +193,7 @@ nas-devel
 neon-devel
 netpbm
 net-snmp-devel
+net-tools
 notification-daemon
 ocaml
 ocaml-facile-devel
@@ -221,8 +222,7 @@ polkit-devel
 postgresql13
 postgresql13-devel
 ppp
-python-devel
-python-sip
+python3-devel
 qt4-devel
 readline-devel
 recode
@@ -234,7 +234,6 @@ scons
 SDL-devel
 speex-devel
 sqlite3-devel
-sqlite-devel
 sshfs-fuse
 subversion-devel
 sudo
diff --git a/redhat/docker/mga9/rpmmacros b/redhat/docker/mga9/rpmmacros
index 2bc3bb37f..e0f078bca 100644
--- a/redhat/docker/mga9/rpmmacros
+++ b/redhat/docker/mga9/rpmmacros
@@ -1,6 +1,10 @@
+%dist .mga9
 %_smp_mflags -j8
 %jobs 8
+%__brp_remove_la_files %nil
 %_program_prefix ""
 %_debugsource_packages %nil
 %_debugsource_template %nil
 %_vpath_builddir .
+%python python3
+%__python /usr/bin/python3