RPM: update docker scripts

3 files changed, 29 insertions, 6 deletions

diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686
index c2f90aa35..5e8c9827d 100644
--- a/redhat/docker/el6/Dockerfile.i686
+++ b/redhat/docker/el6/Dockerfile.i686
@@ -9,10 +9,13 @@ ARG ARCH=i686
 # Install Trinity build dependencies
 COPY packages /packages
 RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \
- && yum -y clean all \
+ && rpm -Uvh http://repo/repo/archives/centos/6/os/i386/Packages/wget-1.12-10.el6.i686.rpm \
+ && rm -fv /etc/yum.repos.d/*.repo \
+ && wget -P /etc/yum.repos.d -nv http://repo/repo/{centos6,epel6}.repo \
+ && setarch i686 yum -y clean all \
  && setarch i686 yum -y update \
- && setarch i686 yum -y install epel-release \
- && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \
+ && rm -fv /etc/yum.repos.d/CentOS-*.repo \
+ && rpm -Uvh --nodeps https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \
  && setarch i686 yum -y install $(</packages)
 
 # Add YUM repository for locally built packages
@@ -35,7 +38,7 @@ COPY rpmmacros /home/trinity/.rpmmacros
 
 # Build supplementary development tools
 
-RUN sudo rpm -Uvh http://repo/trinity/el6/tools/RPMS/i686/m4-1.4.16-10.el6.i686.rpm
+RUN sudo rpm -Uvh http://repo/trinity/current/el6/tools/RPMS/i686/m4-1.4.16-10.el6.i686.rpm
 
 RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm
@@ -58,3 +61,11 @@ RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer
  && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s|%license|%doc|" -e "/^make test/ s|^|#|" \
  && setarch i686 rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps
+
+RUN rpm -i https://dl.fedoraproject.org/pub/epel/7/SRPMS/Packages/c/cln-1.3.4-1.el7.src.rpm \
+ && setarch i686 rpmbuild -ba ${HOME}/rpmbuild/SPECS/cln.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cln{,-devel}-1*.rpm
+
+RUN rpm -i https://dl.fedoraproject.org/pub/epel/7/SRPMS/Packages/l/libqalculate-0.9.7-7.el7.src.rpm \
+ && setarch i686 rpmbuild -ba ${HOME}/rpmbuild/SPECS/libqalculate.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libqalculate{,-devel}-0*.rpm
diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64
index 5d0005d8f..cbde1af99 100644
--- a/redhat/docker/el6/Dockerfile.x86_64
+++ b/redhat/docker/el6/Dockerfile.x86_64
@@ -9,10 +9,12 @@ ARG ARCH=x86_64
 # Install Trinity build dependencies
 COPY packages /packages
 RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \
+ && rpm -Uvh http://repo/repo/archives/centos/6/os/x86_64/Packages/wget-1.12-10.el6.x86_64.rpm \
+ && rm -fv /etc/yum.repos.d/*.repo \
+ && wget -P /etc/yum.repos.d -nv http://repo/repo/{centos6,epel6}.repo \
  && yum -y clean all \
  && yum -y update \
- && yum -y install epel-release \
- && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \
+ && rpm -Uvh --nodeps https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \
  && yum -y install $(</packages)
 
 # Add YUM repository for locally built packages
@@ -58,3 +60,11 @@ RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer
  && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s|%license|%doc|" -e "/^make test/ s|^|#|" \
  && rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps
+
+RUN rpm -i https://dl.fedoraproject.org/pub/epel/7/SRPMS/Packages/c/cln-1.3.4-1.el7.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cln.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cln{,-devel}-1*.rpm
+
+RUN rpm -i https://dl.fedoraproject.org/pub/epel/7/SRPMS/Packages/l/libqalculate-0.9.7-7.el7.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libqalculate.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libqalculate{,-devel}-0*.rpm
diff --git a/redhat/docker/el6/packages b/redhat/docker/el6/packages
index 13d9d827c..7f9db04e2 100644
--- a/redhat/docker/el6/packages
+++ b/redhat/docker/el6/packages
@@ -212,7 +212,9 @@ t1lib-devel
 t1utils
 taglib-devel
 tar
+texi2html
 texinfo
+texinfo-tex
 texlive-utils
 torsocks
 transfig