diff options
| author | François Andriot <albator78@libertysurf.fr> | 2021-01-30 23:53:31 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2021-01-30 23:57:34 +0100 |
| commit | effbf509eea4f37a1a8660242769ed1746b67ee0 (patch) | |
| tree | 47f019bebdc7f0549e43e57ac57856b2d505468b /redhat/docker/osstw | |
| parent | 6581dc50b83f203d65eac61c00a159ab2a6ddb5d (diff) | |
| download | tde-packaging-effbf509eea4f37a1a8660242769ed1746b67ee0.tar.gz tde-packaging-effbf509eea4f37a1a8660242769ed1746b67ee0.zip | |
RPM: update build scripts for Fedora 33 / CentOS 8
Diffstat (limited to 'redhat/docker/osstw')
| -rw-r--r-- | redhat/docker/osstw/Dockerfile.i686 | 10 | ||||
| -rw-r--r-- | redhat/docker/osstw/Dockerfile.x86_64 | 2 | ||||
| -rw-r--r-- | redhat/docker/osstw/packages | 11 |
3 files changed, 15 insertions, 8 deletions
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index 7df793232..e969d0d02 100644 --- a/redhat/docker/osstw/Dockerfile.i686 +++ b/redhat/docker/osstw/Dockerfile.i686 @@ -1,12 +1,14 @@ FROM opensuse32/tumbleweed:latest -ARG TDE_VERSION=14.0.8 +ARG TDE_VERSION=14.1.0 ARG ARCH=i686 # Add PACKMAN repository -RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman -ADD packages /packages -RUN setarch ${ARCH} zypper refresh \ +COPY packages /packages +RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \ + && zypper ar -f -G -n gnome http://ftp.lysator.liu.se/pub/opensuse/repositories/GNOME:/Next/openSUSE_Factory gnome \ + && setarch ${ARCH} zypper refresh \ + && setarch ${ARCH} zypper -n refresh \ && setarch ${ARCH} zypper -n dup \ && setarch ${ARCH} zypper -n update \ && setarch ${ARCH} zypper -n install $(</packages) diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64 index 248b38f76..a289fae5d 100644 --- a/redhat/docker/osstw/Dockerfile.x86_64 +++ b/redhat/docker/osstw/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/tumbleweed:latest -ARG TDE_VERSION=14.0.8 +ARG TDE_VERSION=14.1.0 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages index 9d2f2cdbd..2f103ee95 100644 --- a/redhat/docker/osstw/packages +++ b/redhat/docker/osstw/packages @@ -9,6 +9,8 @@ binutils-devel bison bluez-devel boost-devel +brp-check-suse +brp-extract-appdata ccache cdparanoia cdparanoia-devel @@ -58,6 +60,7 @@ gtk-doc htdig html2ps hunspell-devel +iceauth ImageMagick-devel imake imlib2-devel @@ -90,6 +93,7 @@ libical-devel libidn-devel libiw-devel libjack-devel +libjasper-devel liblcms2-devel liblo-devel liblrdf-devel @@ -146,7 +150,6 @@ libXv-devel libXxf86dga-devel libXxf86vm-devel libyaz-devel -lilo lirc-devel make makeinfo @@ -173,8 +176,8 @@ pcsc-lite-devel perl-PAR-Packer perl-pcsc pkcs11-helper-devel -postgresql -postgresql-devel +postgresql10 +postgresql10-devel python-devel python-gtk-devel python3-devel @@ -215,7 +218,9 @@ vim wireless-tools wv2-devel xcb-proto-devel +xorg-x11 xscreensaver xscreensaver-data xscreensaver-data-extra +xz xz-devel |