diff options
author | François Andriot <albator78@libertysurf.fr> | 2021-05-01 18:08:35 +0200 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2021-05-01 18:08:57 +0200 |
commit | 990ec4c1253d7867d3efd9ad98b7fd2a8bbf0006 (patch) | |
tree | ac9f156cee3f656da006a59a8f19d8e6c2b1976b /redhat/docker/pclinuxos | |
parent | 3abe22ac0a163a1b27d831cbfbe1256b7117ab82 (diff) | |
download | tde-packaging-990ec4c1253d7867d3efd9ad98b7fd2a8bbf0006.tar.gz tde-packaging-990ec4c1253d7867d3efd9ad98b7fd2a8bbf0006.zip |
RPM: update docker scripts
Diffstat (limited to 'redhat/docker/pclinuxos')
-rw-r--r-- | redhat/docker/pclinuxos/Dockerfile.x86_64 | 16 | ||||
-rw-r--r-- | redhat/docker/pclinuxos/packages.x86_64 | 9 | ||||
-rw-r--r-- | redhat/docker/pclinuxos/rpmmacros | 2 |
3 files changed, 17 insertions, 10 deletions
diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64 index ef4190a07..0c5afd8a9 100644 --- a/redhat/docker/pclinuxos/Dockerfile.x86_64 +++ b/redhat/docker/pclinuxos/Dockerfile.x86_64 @@ -1,4 +1,4 @@ -FROM pclinuxos:2020 +FROM pclinuxos:2021 ARG TDE_VERSION=14.0.10 ARG ARCH=x86_64 @@ -39,13 +39,15 @@ COPY rpmmacros /home/trinity/.rpmmacros # Build supplementary development tools RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/torsocks-2.3.0-1.mga7.src.rpm \ && sed -i ${HOME}/rpmbuild/SPECS/torsocks.spec -e "s|%license|%doc|" \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec \ + && sudo rpm -Uvh /home/trinity/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 \ && sed -i ${HOME}/rpmbuild/SPECS/cscope.spec -e "s|%autopatch|%patch0|" \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec \ + && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm -USER root -RUN rpm -Uvh /home/trinity/rpmbuild/RPMS/*/torsocks-2*.rpm /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm - -USER trinity +RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/rpcsvc-proto-1.4-1.mga8.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/rpcsvc-proto.spec -e "s|%autosetup .*|%setup -q|" -e "s|%configure|%configure2_5x|" -e "s|%license|%doc|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/rpcsvc-proto.spec \ + && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/rpcgen-1*.rpm diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64 index 800b9989a..3d9b6c38b 100644 --- a/redhat/docker/pclinuxos/packages.x86_64 +++ b/redhat/docker/pclinuxos/packages.x86_64 @@ -9,6 +9,8 @@ ccache cdparanoia chmlib-devel chrpath +clamav +clamav-devel cmake cups-devel desktop-file-utils @@ -48,7 +50,7 @@ intltool java-devel java-sun lcms-devel -lib64clucene-devel +lib64clucene2-devel lib64cryptsetup-devel lib64db4.8-devel lib64dvdread-devel @@ -79,6 +81,7 @@ lib64xtst-devel lib64yaz-devel libcap-devel libcdda-devel +libcln-devel libconfig-devel libcurl-devel libffmpeg-devel @@ -112,10 +115,12 @@ libraw1394-devel librsvg librsync-devel libsamplerate-devel +libsecret-devel libsmbclient-devel libsm-devel libt1lib-devel libtheora-devel +libtirpc-devel libudev-devel libuuid-devel libv4l-devel @@ -140,6 +145,7 @@ libxslt-devel libxxf86dga-devel lirc-devel lm_sensors-devel +m4 mesaglu-devel mysql-devel nas-devel @@ -186,6 +192,5 @@ vim-enhanced x11-font-util xscreensaver xscreensaver-base -xscreensaver-extrusion xscreensaver-gl yaz diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros index 6b1a9016a..067e3aa64 100644 --- a/redhat/docker/pclinuxos/rpmmacros +++ b/redhat/docker/pclinuxos/rpmmacros @@ -1,4 +1,4 @@ %dist .pclos %_smp_mflags -j8 %jobs 8 -%pclinuxos 2019 +%pclinuxos 2021 |