RPM: various updates for TDE 14.0.12

Signed-off-by: François Andriot <albator78@libertysurf.fr>

10 files changed, 18 insertions, 4 deletions

diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64
index 96ed1d420..5b5199e50 100644
--- a/redhat/docker/el6/Dockerfile.x86_64
+++ b/redhat/docker/el6/Dockerfile.x86_64
@@ -12,6 +12,7 @@ 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 \
+ && sed -i /etc/yum.repos.d/*.repo -e "s|https://|http://|g" \
  && yum -y clean all \
  && yum -y update \
  && rpm -Uvh --nodeps https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \
diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages
index 46c7034d9..5ba929a4c 100644
--- a/redhat/docker/el7/packages
+++ b/redhat/docker/el7/packages
@@ -10,6 +10,7 @@ bison
 bluez-libs-devel
 boost-devel
 bzip2-devel
+byacc
 ccache
 cdparanoia
 cdparanoia-devel
@@ -19,6 +20,7 @@ clamav
 clamav-devel
 clucene-core-devel
 cmake
+cmake3
 cpp
 cppunit-devel
 createrepo
@@ -174,6 +176,7 @@ pigz
 pilot-link-devel
 pkcs11-helper-devel
 pkgconfig(pygtk-2.0)
+polkit-devel
 poppler-devel
 postgresql-devel
 ppp
diff --git a/redhat/docker/el7/rpmmacros b/redhat/docker/el7/rpmmacros
index b76d30014..e0a64de43 100644
--- a/redhat/docker/el7/rpmmacros
+++ b/redhat/docker/el7/rpmmacros
@@ -1,3 +1,4 @@
 %dist .el7
 %_smp_mflags -j8
 %jobs 8
+%cmake %cmake3
diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64
index 697a1decd..1306a7b30 100644
--- a/redhat/docker/el8/Dockerfile.x86_64
+++ b/redhat/docker/el8/Dockerfile.x86_64
@@ -1,4 +1,4 @@
-FROM centos:8
+FROM rockylinux:8
 
 ARG TDE_VERSION=14.0.11
 ARG ARCH=x86_64
diff --git a/redhat/docker/f35/packages b/redhat/docker/f35/packages
index f541aa930..f6d605f1a 100644
--- a/redhat/docker/f35/packages
+++ b/redhat/docker/f35/packages
@@ -115,6 +115,7 @@ libofx-devel
 libogg-devel
 libotr-devel
 libpaper-devel
+libpqxx-devel
 libqalculate-devel
 libraw1394-devel
 librsvg2
@@ -187,6 +188,7 @@ perl(XML::Parser)
 pilot-link-devel
 pkcs11-helper-devel
 pkgconfig(pygtk-2.0)
+polkit-devel
 poppler-devel
 postgresql
 postgresql-devel
diff --git a/redhat/docker/mga8/packages.i686 b/redhat/docker/mga8/packages.i686
index af6c6feb7..da94c63f9 100644
--- a/redhat/docker/mga8/packages.i686
+++ b/redhat/docker/mga8/packages.i686
@@ -213,6 +213,7 @@ pinentry-gtk2
 pkgconfig(audiofile)
 pkgconfig(libpng16)
 polkit-agent-none
+polkit-devel
 postgresql13
 postgresql13-devel
 ppp
diff --git a/redhat/docker/mga8/packages.x86_64 b/redhat/docker/mga8/packages.x86_64
index ad8802b2c..442497141 100644
--- a/redhat/docker/mga8/packages.x86_64
+++ b/redhat/docker/mga8/packages.x86_64
@@ -216,6 +216,7 @@ pinentry-gtk2
 pkgconfig(audiofile)
 pkgconfig(libpng16)
 polkit-agent-none
+polkit-devel
 postgresql13
 postgresql13-devel
 ppp
diff --git a/redhat/docker/oss153/packages b/redhat/docker/oss153/packages
index 78c263029..fccdfb384 100644
--- a/redhat/docker/oss153/packages
+++ b/redhat/docker/oss153/packages
@@ -164,7 +164,9 @@ perl-PAR-Packer
 perl-pcsc
 pkcs11-helper-devel
 pkgconfig(pygtk-2.0)
+polkit-devel
 postgresql10
+postgresql10-devel
 python-devel
 python3-devel
 python3-sip-devel
diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64
index 574d18973..58222751b 100644
--- a/redhat/docker/osstw/Dockerfile.x86_64
+++ b/redhat/docker/osstw/Dockerfile.x86_64
@@ -28,3 +28,7 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
 # Add GeoIP
 RUN rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.3/repo/oss/src/GeoIP-1.6.12-6.3.1.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/*GeoIP*.rpm
+
+# Add Jasper
+RUN sudo rpm -e libjasper-devel libjasper6 \
+ && sudo rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/distribution/leap/15.3/repo/oss/x86_64/{jasper,libjasper-devel,libjasper4}-2.0.14-3.19.1.x86_64.rpm
diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages
index 8a8f664f1..fc55cae1c 100644
--- a/redhat/docker/osstw/packages
+++ b/redhat/docker/osstw/packages
@@ -9,7 +9,6 @@ bison
 bluez-devel
 boost-devel
 brp-check-suse
-brp-extract-appdata
 ccache
 cdparanoia
 cdparanoia-devel
@@ -93,6 +92,7 @@ libical-devel
 libidn-devel
 libiw-devel
 libjack-devel
+libjasper6
 libjasper-devel
 liblcms2-devel
 liblo-devel
@@ -121,7 +121,6 @@ librsvg-devel
 libsamplerate-devel
 libSDL-devel
 libsensors4-devel
-libsmbclient-devel
 libsndfile-devel
 libtag-devel
 libtheora-devel
@@ -129,7 +128,6 @@ libtiff-devel
 libtirpc-devel
 libtool
 libtwolame-devel
-libudev-devel
 libudisks2-0-devel
 libv4l-devel
 libvisual-devel
@@ -197,6 +195,7 @@ swig
 sword-devel
 texlive-adjustbox
 texlive-etoc
+texlive-float
 texlive-hanging
 texlive-metafont-bin
 texlive-multirow