summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2021-05-01 18:08:35 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2021-05-01 18:08:57 +0200
commit990ec4c1253d7867d3efd9ad98b7fd2a8bbf0006 (patch)
treeac9f156cee3f656da006a59a8f19d8e6c2b1976b
parent3abe22ac0a163a1b27d831cbfbe1256b7117ab82 (diff)
downloadtde-packaging-990ec4c1253d7867d3efd9ad98b7fd2a8bbf0006.tar.gz
tde-packaging-990ec4c1253d7867d3efd9ad98b7fd2a8bbf0006.zip
RPM: update docker scripts
-rw-r--r--redhat/docker/el6/Dockerfile.i68619
-rw-r--r--redhat/docker/el6/Dockerfile.x86_6414
-rw-r--r--redhat/docker/el6/packages2
-rw-r--r--redhat/docker/el7/Dockerfile.x86_646
-rw-r--r--redhat/docker/el7/packages2
-rw-r--r--redhat/docker/el8/packages1
-rw-r--r--redhat/docker/f32/Dockerfile.x86_644
-rw-r--r--redhat/docker/f32/packages2
-rw-r--r--redhat/docker/f32/rpmmacros2
-rw-r--r--redhat/docker/mga6/packages.i6861
-rw-r--r--redhat/docker/mga6/packages.x86_641
-rw-r--r--redhat/docker/mga7/packages.i68613
-rw-r--r--redhat/docker/mga7/packages.x86_641
-rw-r--r--redhat/docker/oss151/packages3
-rw-r--r--redhat/docker/oss152/Dockerfile.x86_641
-rw-r--r--redhat/docker/oss152/packages1
-rw-r--r--redhat/docker/pclinuxos.pkg10
-rwxr-xr-xredhat/docker/pclinuxos.sh2
-rw-r--r--redhat/docker/pclinuxos/Dockerfile.x86_6416
-rw-r--r--redhat/docker/pclinuxos/packages.x86_649
-rw-r--r--redhat/docker/pclinuxos/rpmmacros2
21 files changed, 76 insertions, 36 deletions
diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686
index 1f449b0e5..85fd6bc9d 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 2957f6014..4f78b4205 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
diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64
index 95b52a3b1..3dfcdda6d 100644
--- a/redhat/docker/el7/Dockerfile.x86_64
+++ b/redhat/docker/el7/Dockerfile.x86_64
@@ -38,11 +38,11 @@ COPY rpmmacros /home/trinity/.rpmmacros
RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Everything/source/SRPMS/d/dirmngr-1.1.1-5.fc21.src.rpm \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/dirmngr-1*.rpm
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/y/yaz-5.14.11-17.fc30.src.rpm --define "_pkgdocdir /usr/share/doc/yaz" \
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/30/Everything/source/tree/Packages/y/yaz-5.14.11-17.fc30.src.rpm --define "_pkgdocdir /usr/share/doc/yaz" \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libyaz{,-devel}-5*.rpm
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/r/rdesktop-1.9.0-2.fc32.src.rpm \
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/32/Everything/source/tree/Packages/r/rdesktop-1.9.0-2.fc32.src.rpm \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/pilot-link-0.12.5-44.fc32.src.rpm \
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/32/Everything/source/tree/Packages/p/pilot-link-0.12.5-44.fc32.src.rpm \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel,-libs}-0*.rpm
diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages
index 7368877e2..46c7034d9 100644
--- a/redhat/docker/el7/packages
+++ b/redhat/docker/el7/packages
@@ -46,6 +46,7 @@ gamin-devel
gcc
gcc-c++
gcc-gfortran
+geoip-devel
gettext-devel
glib-devel
gmime-devel
@@ -114,6 +115,7 @@ libqalculate-devel
libraw1394-devel
librsvg2-tools
libsamplerate-devel
+libsecret-devel
libsmbclient-devel
libsndfile-devel
libssh2-devel
diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages
index be1422086..fc8af868a 100644
--- a/redhat/docker/el8/packages
+++ b/redhat/docker/el8/packages
@@ -110,6 +110,7 @@ libraw1394-devel
librsvg2-tools
librsync-devel
libsamplerate-devel
+libsecret-devel
libsmbclient-devel
libsndfile-devel
libtheora-devel
diff --git a/redhat/docker/f32/Dockerfile.x86_64 b/redhat/docker/f32/Dockerfile.x86_64
index bf15522cb..c6374db5b 100644
--- a/redhat/docker/f32/Dockerfile.x86_64
+++ b/redhat/docker/f32/Dockerfile.x86_64
@@ -26,3 +26,7 @@ RUN chmod a+r /usr/libexec/utempter/utempter
# Add non-root user to build packages
RUN useradd -m -s /bin/bash -u 1000 trinity && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
COPY rpmmacros /home/trinity/.rpmmacros
+
+RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/python-exif-2.2.0-5.fc32.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/python-exif.spec --define "py2 1" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/noarch/python2-exif-*
diff --git a/redhat/docker/f32/packages b/redhat/docker/f32/packages
index 7b438ade0..4bd975a1e 100644
--- a/redhat/docker/f32/packages
+++ b/redhat/docker/f32/packages
@@ -193,6 +193,7 @@ postgresql-server-devel
ppp
pulseaudio-libs-devel
python
+python2-setuptools
python3-devel
qt4-devel
recode
@@ -229,6 +230,7 @@ xmedcon
xmedcon-devel
xmlto
xorg-x11-font-utils
+xorg-x11-server-utils
xscreensaver
xscreensaver-extras
xz-devel
diff --git a/redhat/docker/f32/rpmmacros b/redhat/docker/f32/rpmmacros
index fe41a3f29..b7585b5f2 100644
--- a/redhat/docker/f32/rpmmacros
+++ b/redhat/docker/f32/rpmmacros
@@ -1,3 +1,5 @@
%dist .fc32
%_smp_mflags -j8
%jobs 8
+%_debugsource_packages %nil
+%_debugsource_template %nil
diff --git a/redhat/docker/mga6/packages.i686 b/redhat/docker/mga6/packages.i686
index 6ee0415b2..85ed2ec06 100644
--- a/redhat/docker/mga6/packages.i686
+++ b/redhat/docker/mga6/packages.i686
@@ -153,6 +153,7 @@ libpx-devel
libqalculate-devel
libraw1394-devel
librsvg
+libsecret-devel
libsmbclient-devel
libsm-devel
libsndfile-devel
diff --git a/redhat/docker/mga6/packages.x86_64 b/redhat/docker/mga6/packages.x86_64
index 9af2ed003..f499915be 100644
--- a/redhat/docker/mga6/packages.x86_64
+++ b/redhat/docker/mga6/packages.x86_64
@@ -153,6 +153,7 @@ libpx-devel
libqalculate-devel
libraw1394-devel
librsvg
+libsecret-devel
libsmbclient-devel
libsm-devel
libsndfile-devel
diff --git a/redhat/docker/mga7/packages.i686 b/redhat/docker/mga7/packages.i686
index cc695fb73..f94a02efd 100644
--- a/redhat/docker/mga7/packages.i686
+++ b/redhat/docker/mga7/packages.i686
@@ -67,6 +67,7 @@ kde-dev-scripts
libapr-devel
libapr-util-devel
libart_lgpl-devel
+libassuan-devel
libattr-devel
libavformat58
libbinutils-devel
@@ -74,14 +75,10 @@ libblkid-devel
libcdda-devel
libcln-devel
libclucene-devel
-libclucene-devel
-libcommoncpp-devel
libcommoncpp-devel
libconfig-devel
libcryptsetup-devel
libcurl-devel
-libcurl-devel
-libdvdread-devel
libdvdread-devel
libecpg9.6_6
libexiv2-devel
@@ -89,7 +86,6 @@ libfbclient-devel
libffmpeg-devel
libflac++-devel
libflac-devel
-libflac-devel
libfontenc-devel
libgadu-devel
libgeoip-devel
@@ -108,14 +104,12 @@ libiodbc-devel
libiw-devel
libjack-devel
libjasper-devel
-libjasper-devel
libjpeg-devel
libkarma-devel
liblo-devel
liblrdf-devel
liblua-devel
libmad-devel
-libmad-devel
libmng-devel
libmp3lame-devel
libmp4v2-devel
@@ -127,7 +121,6 @@ libnpth-devel
libofx-devel
libotr-devel
libpaper-devel
-libpaper-devel
libpkcs11-helper-devel
libpoppler-devel
libpulseaudio-devel
@@ -140,7 +133,6 @@ libsmbclient-devel
libsm-devel
libsndfile-devel
libt1lib-devel
-libt1lib-devel
libtheora-devel
libtiff-devel
libtwolame-devel
@@ -162,7 +154,6 @@ libxdg-basedir-devel
libxext-devel
libxft-devel
libxi-devel
-libxi-devel
libxine1.2-devel
libxinerama-devel
libxkbfile-devel
@@ -174,8 +165,6 @@ libxslt-devel
libxtst-devel
libxv-devel
libxxf86dga-devel
-libxxf86dga-devel
-libyaz-devel
libyaz-devel
lilo
lirc-devel
diff --git a/redhat/docker/mga7/packages.x86_64 b/redhat/docker/mga7/packages.x86_64
index 9c8f92ea0..0c84baf4c 100644
--- a/redhat/docker/mga7/packages.x86_64
+++ b/redhat/docker/mga7/packages.x86_64
@@ -66,6 +66,7 @@ karma-sharp
kde-dev-scripts
lib64apr-devel
lib64apr-util-devel
+lib64assuan-devel
lib64avformat58
lib64binutils-devel
lib64boost_python3-devel
diff --git a/redhat/docker/oss151/packages b/redhat/docker/oss151/packages
index 26af91b78..0d75fd57e 100644
--- a/redhat/docker/oss151/packages
+++ b/redhat/docker/oss151/packages
@@ -8,12 +8,15 @@ bind-devel
binutils-devel
bison
boost-devel
+brp-check-suse
+brp-extract-appdata
ccache
cdparanoia
cdparanoia-devel
chmlib-devel
chrpath
clamav
+clamav-devel
cln-devel
clucene-core-devel
cmake
diff --git a/redhat/docker/oss152/Dockerfile.x86_64 b/redhat/docker/oss152/Dockerfile.x86_64
index 6145d25ea..4b65eb3b7 100644
--- a/redhat/docker/oss152/Dockerfile.x86_64
+++ b/redhat/docker/oss152/Dockerfile.x86_64
@@ -16,6 +16,7 @@ RUN echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \
# Add non-root user to build packages
RUN useradd -m -s /bin/bash -u 1000 trinity \
&& echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+
COPY rpmmacros /home/trinity/.rpmmacros
# Add YUM repository for locally built packages
diff --git a/redhat/docker/oss152/packages b/redhat/docker/oss152/packages
index 7abef8938..0fd341899 100644
--- a/redhat/docker/oss152/packages
+++ b/redhat/docker/oss152/packages
@@ -16,6 +16,7 @@ cdparanoia-devel
chmlib-devel
chrpath
clamav
+clamav-devel
cln-devel
clucene-core-devel
cmake
diff --git a/redhat/docker/pclinuxos.pkg b/redhat/docker/pclinuxos.pkg
index 0a3a5f767..1b72a6d01 100644
--- a/redhat/docker/pclinuxos.pkg
+++ b/redhat/docker/pclinuxos.pkg
@@ -61,6 +61,7 @@ lib64fuse3_3
lib64gcrypt20
lib64gdbm3
lib64gdk_pixbuf2.0_0
+lib64gdk_pixbuf_xlib2.0_0
lib64gio2.0_0
lib64glib2.0_0
lib64gmp10
@@ -79,16 +80,17 @@ lib64keyutils1
lib64krb53
lib64ksba8
lib64ldap2.4_2
-lib64libcap-ng0
+lib64cap-ng0
lib64lua5.1
lib64lzma5
lib64magic1
lib64mount1
-lib64mpfr4
+lib64mpfr6
lib64ncurses5
lib64ncurses6
lib64ncursesw6
-lib64nettle7
+lib64nettle8
+lib64nghttp2_14
lib64notify4
lib64npth0
lib64nspr4
@@ -107,7 +109,7 @@ lib64png3
lib64popt0
lib64psl5
lib64python3.6
-lib64readline7
+lib64readline8
lib64rpm1
lib64rtmp1
lib64sasl2
diff --git a/redhat/docker/pclinuxos.sh b/redhat/docker/pclinuxos.sh
index 52f858357..aa906f26c 100755
--- a/redhat/docker/pclinuxos.sh
+++ b/redhat/docker/pclinuxos.sh
@@ -1,7 +1,7 @@
#!/bin/bash -ex
NAME="pclinuxos"
-VERSION="${1:-2020}" # E.g: '2020'
+VERSION="${1:-2021}" # E.g: '2020'
IMAGE="${NAME}:${VERSION}"
INSTALLROOT="/dev/shm/${IMAGE}"
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