summaryrefslogtreecommitdiffstats
path: root/redhat/docker
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2020-01-18 20:25:56 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2020-01-18 20:29:31 +0100
commita01912d54a1bf24aaa20bfbfb33709134d52d6f6 (patch)
treed8ce8396f2df160f29730d13803af4717a361cdd /redhat/docker
parent685d3568bfc83de6ab77e5f817edb1d3514db323 (diff)
downloadtde-packaging-a01912d54a1bf24aaa20bfbfb33709134d52d6f6.tar.gz
tde-packaging-a01912d54a1bf24aaa20bfbfb33709134d52d6f6.zip
RPM: update build scripts
Diffstat (limited to 'redhat/docker')
-rw-r--r--redhat/docker/el6/Dockerfile.i6862
-rw-r--r--redhat/docker/el6/packages3
-rw-r--r--redhat/docker/el8/Dockerfile.x86_642
-rw-r--r--redhat/docker/f30/packages7
-rw-r--r--redhat/docker/f31/packages2
-rw-r--r--redhat/docker/mga7/Dockerfile.i6862
-rw-r--r--redhat/docker/mga7/packages.i6861
-rw-r--r--redhat/docker/mga7/packages.x86_641
-rwxr-xr-xredhat/docker/opensuse32.sh14
-rw-r--r--redhat/docker/osstw/Dockerfile.i6862
-rw-r--r--redhat/docker/osstw/Dockerfile.x86_642
-rw-r--r--redhat/docker/osstw/packages4
-rw-r--r--redhat/docker/pclinuxos/Dockerfile.x86_641
13 files changed, 29 insertions, 14 deletions
diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686
index ba9982502..23358198f 100644
--- a/redhat/docker/el6/Dockerfile.i686
+++ b/redhat/docker/el6/Dockerfile.i686
@@ -42,7 +42,7 @@ ADD rpmmacros /home/trinity/.rpmmacros
RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/m4-1.4.16-10.el7.src.rpm
RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/m4-1*.rpm
-RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm
+RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps
RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm
RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-Install-1.06-4.el7.src.rpm
diff --git a/redhat/docker/el6/packages b/redhat/docker/el6/packages
index 62d186f6f..1a713084c 100644
--- a/redhat/docker/el6/packages
+++ b/redhat/docker/el6/packages
@@ -29,7 +29,7 @@ db4-devel
dbus-glib-devel
djvulibre
djvulibre-devel
-docbook2X
+docbook2x
doxygen
e2fsprogs-devel
emacs
@@ -56,6 +56,7 @@ gnokii-devel
gperf
gpgme-devel
gphoto2-devel
+gpsim-devel
GraphicsMagick-devel
gsl-devel
gstreamer-devel
diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64
index d83c0c1c9..2f8d8aeb3 100644
--- a/redhat/docker/el8/Dockerfile.x86_64
+++ b/redhat/docker/el8/Dockerfile.x86_64
@@ -80,4 +80,4 @@ RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm
RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/s/sword-1.8.1-11.fc30.src.rpm
RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm
-RUN sudo rpm -Uvh http://rpms.remirepo.net/enterprise/8/remi/x86_64//hiredis-0.13.3-9.el8.remi.x86_64.rpm http://rpms.remirepo.net/enterprise/8/remi/x86_64//libyaz-5.14.11-14.el8.remi.x86_64.rpm
+RUN sudo rpm -Uvh http://rpms.remirepo.net/enterprise/8/remi/x86_64//hiredis-0.13.3-9.el8.remi.x86_64.rpm http://rpms.remirepo.net/enterprise/8/remi/x86_64/libyaz{,-devel}-5.14.11-14.el8.remi.x86_64.rpm
diff --git a/redhat/docker/f30/packages b/redhat/docker/f30/packages
index 7a77a3476..8b9d76b4c 100644
--- a/redhat/docker/f30/packages
+++ b/redhat/docker/f30/packages
@@ -29,6 +29,7 @@ db4-devel
dbus-glib-devel
djvulibre
djvulibre-devel
+dnf-plugin-ovl
docbook2X
doxygen
dssi-devel
@@ -65,6 +66,7 @@ gtk3-devel
gtk+-devel
gtk-doc
guile-devel
+harfbuzz-devel
hspell-devel
htdig
html2ps
@@ -130,6 +132,7 @@ libtool-ltdl-devel
libudev-devel
libudisks2-devel
libutempter-devel
+libuuid-devel
libv4l-devel
libvisual-devel
libvncserver-devel
@@ -163,6 +166,7 @@ net-tools
nspr-devel
ocaml
ocaml(compiler)
+ocaml-facile-devel
OpenEXR-devel
openldap-devel
opensc
@@ -187,6 +191,8 @@ postgresql
postgresql-devel
postgresql-server-devel
pulseaudio-libs-devel
+python
+python3-devel
qt4-devel
recode
redhat-rpm-config
@@ -209,6 +215,7 @@ t1lib-devel
t1utils
taglib-devel
texinfo
+texlive-newunicodechar
torsocks
transfig
udisks-devel
diff --git a/redhat/docker/f31/packages b/redhat/docker/f31/packages
index 4039b615b..02edb6a1d 100644
--- a/redhat/docker/f31/packages
+++ b/redhat/docker/f31/packages
@@ -179,7 +179,7 @@ pcsc-perl
perl
perl-devel
perl(ExtUtils::MakeMaker)
-perl-PAR-Packer
+perl(PAR::Packer)
perl(XML::Parser)
pilot-link-devel
pkcs11-helper-devel
diff --git a/redhat/docker/mga7/Dockerfile.i686 b/redhat/docker/mga7/Dockerfile.i686
index 67d349d52..97cee52ff 100644
--- a/redhat/docker/mga7/Dockerfile.i686
+++ b/redhat/docker/mga7/Dockerfile.i686
@@ -42,5 +42,5 @@ RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSI
RUN sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
# Build development packages that are missing
-RUN rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/perl-PAR-Packer-1.47.0-2.mga7.src.rpm
+RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/perl-PAR-Packer-1.47.0-2.mga7.src.rpm
RUN sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm"
diff --git a/redhat/docker/mga7/packages.i686 b/redhat/docker/mga7/packages.i686
index a84e869ea..5b196d053 100644
--- a/redhat/docker/mga7/packages.i686
+++ b/redhat/docker/mga7/packages.i686
@@ -147,6 +147,7 @@ libtwolame-devel
libudev-devel
libungif-devel
libusb1.0-devel
+libutempter
libutempter0
libutempter-devel
libv4l-devel
diff --git a/redhat/docker/mga7/packages.x86_64 b/redhat/docker/mga7/packages.x86_64
index 539f10c4d..a23712301 100644
--- a/redhat/docker/mga7/packages.x86_64
+++ b/redhat/docker/mga7/packages.x86_64
@@ -158,6 +158,7 @@ libsndfile-devel
libt1lib-devel
libtheora-devel
libungif-devel
+libutempter
libvisual-devel
libvorbis-devel
libwmf-devel
diff --git a/redhat/docker/opensuse32.sh b/redhat/docker/opensuse32.sh
index a3b888c75..3a3a6c2b2 100755
--- a/redhat/docker/opensuse32.sh
+++ b/redhat/docker/opensuse32.sh
@@ -1,19 +1,21 @@
#!/bin/bash
-NAME="opensuse32"
VERSION="$1" # E.g: '42.3'
-IMAGE="${NAME}:${VERSION}"
-INSTALLROOT="/dev/shm/${IMAGE}"
-
-sudo rm -rf "${INSTALLROOT}"
-sudo mkdir -p "${INSTALLROOT}"
if [ "${VERSION}" = "tumbleweed" ]; then
URL="http://download.opensuse.org/tumbleweed"
+ NAME="opensuse32/tumbleweed"
else
URL="http://download.opensuse.org/distribution/leap/${VERSION}"
+ NAME="opensuse32/leap"
fi
+IMAGE="${NAME}:${VERSION}"
+INSTALLROOT="/dev/shm/${IMAGE}"
+
+sudo rm -rf "${INSTALLROOT}"
+sudo mkdir -p "${INSTALLROOT}"
+
sudo zypper --root "${INSTALLROOT}" \
ar "${URL}/repo/oss/" "oss"
sudo zypper --root "${INSTALLROOT}" \
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686
index f5878bacd..1e0b8a168 100644
--- a/redhat/docker/osstw/Dockerfile.i686
+++ b/redhat/docker/osstw/Dockerfile.i686
@@ -1,4 +1,4 @@
-FROM opensuse32:tumbleweed
+FROM opensuse32/tumbleweed:latest
ARG TDE_VERSION=14.0.7
ARG ARCH=i686
diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64
index a30f09e20..42d7007c3 100644
--- a/redhat/docker/osstw/Dockerfile.x86_64
+++ b/redhat/docker/osstw/Dockerfile.x86_64
@@ -1,4 +1,4 @@
-FROM opensuse:tumbleweed
+FROM opensuse/tumbleweed:latest
ARG TDE_VERSION=14.0.7
ARG ARCH=x86_64
diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages
index f808826c5..81f51221f 100644
--- a/redhat/docker/osstw/packages
+++ b/redhat/docker/osstw/packages
@@ -17,7 +17,7 @@ clamav
cln-devel
clucene-core-devel
cmake
-createrepo
+createrepo_c
cups-devel
cyrus-sasl-devel
dbus-1-devel
@@ -155,6 +155,7 @@ net-tools
net-tools-deprecated
NetworkManager-devel
ocaml
+openexr
openexr-devel
opensc
openslp-devel
@@ -174,6 +175,7 @@ postgresql10-devel
python-devel
python-gtk-devel
python3-devel
+recode
rpcgen
rpm-build
rsvg-convert
diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64
index a449dca81..9617ead17 100644
--- a/redhat/docker/pclinuxos/Dockerfile.x86_64
+++ b/redhat/docker/pclinuxos/Dockerfile.x86_64
@@ -45,4 +45,5 @@ RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/torsocks-2*.rpm
RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/cscope-15.9-1.mga7.src.rpm
RUN sed -i ${HOME}/rpmbuild/SPECS/cscope.spec -e "s|%autopatch|%patch0|"
+RUN rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec
RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cscope-15*.rpm