RPM: synchronize redhat directory with r14.1.x branch

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

2 files changed, 31 insertions, 18 deletions

diff --git a/redhat/docker/oss153/Dockerfile.x86_64 b/redhat/docker/oss153/Dockerfile.x86_64
index 5931d6e4c..d2e770b22 100644
--- a/redhat/docker/oss153/Dockerfile.x86_64
+++ b/redhat/docker/oss153/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse/leap:15.3
 
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
@@ -27,3 +27,10 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
  && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \
  && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
  && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
+
+# Install heimdal development files
+RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.3/repo/oss/src/libheimdal-7.7.0-bp153.1.19.src.rpm \
+ && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.7.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.7.0/heimdal-7.7.0.tar.gz" \
+ && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.7.0.tar.gz|" -e "/^%patch0/ s|^%|#|" \
+ && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \
+ && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.7.0/tools/ install
diff --git a/redhat/docker/oss153/packages b/redhat/docker/oss153/packages
index 0f6f7c6f2..1b18b1d8b 100644
--- a/redhat/docker/oss153/packages
+++ b/redhat/docker/oss153/packages
@@ -21,13 +21,14 @@ clucene-core-devel
 cmake
 createrepo
 cups-devel
+curl
 cyrus-sasl-devel
 dbus-1-devel
 dbus-1-glib-devel
 djvulibre
+docbook2x
 docbook-utils
 docbook-xsl-stylesheets
-docbook2x
 doxygen GraphicsMagick
 dssi-devel
 fdupes
@@ -36,6 +37,7 @@ fftw3-devel
 file-devel
 flac-devel
 flex
+font-util
 freetype-devel
 fribidi-devel
 gamin-devel
@@ -43,15 +45,15 @@ gcc-c++
 giflib-devel
 git
 glu-devel
-gmime-devel
 gmime2_6-devel
+gmime-devel
 gmp-devel
 gperf xmlto
 GraphicsMagick-devel
 gsl-devel
 gstreamer-devel
-gstreamer-plugins-base-devel 
 gstreamer-devel
+gstreamer-plugins-base-devel 
 gtk2-devel
 gtk3-devel
 gtk-doc
@@ -60,6 +62,7 @@ html2ps
 hunspell-devel
 iceauth
 ImageMagick-devel
+imake
 imlib2-devel
 intltool
 java-1_8_0-openjdk-devel
@@ -83,6 +86,7 @@ libdb-4_8-devel
 libdvdread-devel
 libexempi-devel
 libexiv2-devel
+libfontenc-devel
 libgadu-devel
 libGeoIP-devel
 libgpgme-devel
@@ -121,9 +125,10 @@ libraw1394-devel
 librsvg-devel
 libsamplerate-devel
 libSDL-devel
-libSM-devel
 libsmbclient-devel
+libSM-devel
 libsndfile-devel
+libssh-devel
 libtag-devel
 libtheora-devel
 libtiff-devel
@@ -137,10 +142,17 @@ libvisual-devel
 libvorbis-devel
 libwmf-devel
 libwpd-devel
+libXaw-devel
+libXdmcp-devel
 libxine-devel
+libxkbfile-devel
 libXmu-devel
+libXScrnSaver-devel
 libxslt-devel
 libXt-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
 libyaz-devel
 libzrtpcpp-devel
 lirc-devel
@@ -164,18 +176,23 @@ patch
 pciutils-devel
 pcre-devel
 pcsc-lite-devel
+perl-JSON
 perl-PAR-Packer
 perl-pcsc
 pkcs11-helper-devel
 pkgconfig(pygtk-2.0)
-python-devel
+polkit-devel
+postgresql
+postgresql-server-devel
 python3-devel
 python3-sip-devel
+python-devel
 recode
 rpcgen
 rpm-build
 rpmlint
 rsvg-convert
+rsync
 ruby
 ruby-devel
 sane-backends-devel
@@ -186,6 +203,7 @@ subversion-devel
 sudo
 swig
 sword-devel
+texinfo
 torsocks
 transfig
 unixODBC-devel
@@ -203,15 +221,3 @@ xscreensaver
 xscreensaver-data
 xscreensaver-data-extra
 xz-devel
-
-font-util
-imake
-libXScrnSaver-devel
-libXdmcp-devel
-libfontenc-devel
-libssh-devel
-libxkbfile-devel
-libXxf86vm-devel
-libXxf86dga-devel
-libXaw-devel
-libXv-devel