RPM: many updates for upcoming R14.1.3

Signed-off-by: François Andriot <[email protected]>

2 files changed, 18 insertions, 4 deletions

diff --git a/redhat/docker/omvcooker/Dockerfile.x86_64 b/redhat/docker/omvcooker/Dockerfile.x86_64
index 55f8a0abf..7c6184eb4 100644
--- a/redhat/docker/omvcooker/Dockerfile.x86_64
+++ b/redhat/docker/omvcooker/Dockerfile.x86_64
@@ -26,7 +26,9 @@ USER trinity
 COPY rpmmacros /home/trinity/.rpmmacros
 
 RUN set -x \
- && rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/development/rawhide/Everything/source/tree/Packages/r/rdesktop-1.9.0-15.fc40.src.rpm --nodeps \
+ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdesktop-1.9.0-6.mga9.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/rdesktop.spec -e "s|%{_rpmconfigdir}/%{_real_vendor}|/usr/share/libtool/config|" \
+ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdesktop.spec --define "mkrel %nil" \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm
 
 RUN set -x \
@@ -34,9 +36,9 @@ RUN set -x \
  && rpmbuild -bb ${HOME}/rpmbuild/SPECS/sword.spec --define "cmake_build %__make %{?_smp_mflags}" --define "cmake_install %__make -C build install DESTDIR=%{?buildroot}" --define "__cc /usr/bin/gcc" --define "__cxx /usr/bin/g++" --define "_disable_ld_no_undefined 1" --define "mkrel %nil" --define "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --nodeps \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64sword{1.9,-devel},sword}-1.9.0-*.rpm
 
-#RUN set -x \
-# && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/yaz-5.34.0-1.mga9.src.rpm --define "mkrel %nil" --nodeps \
-# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64yaz{5,-devel},yaz}-5*.rpm
+RUN set -x \
+ && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/yaz-5.34.2-1.mga10.src.rpm --define "mkrel %nil" --nodeps \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64yaz{5,-devel},yaz}-5*.rpm
 
 RUN set -x \
  && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdiff-backup-2.2.2-1.mga9.src.rpm \
@@ -63,3 +65,9 @@ RUN set -x \
  && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s/MYMETA.yml//" \
  && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec --define "mkrel %nil" \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm
+
+RUN set -x \
+ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/wireless-tools-30-0.pre9.14.mga9.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/wireless-tools.spec -e "s/%patch/%patch -P /" \
+ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/wireless-tools.spec --define "mkrel %nil" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/lib64iw{30,-devel}-30*.rpm
diff --git a/redhat/docker/omvcooker/packages b/redhat/docker/omvcooker/packages
index 47a126218..87fc9fd5f 100644
--- a/redhat/docker/omvcooker/packages
+++ b/redhat/docker/omvcooker/packages
@@ -166,6 +166,7 @@ lib64tirpc-devel
 lib64twolame-devel
 lib64udev-devel
 lib64udisks-devel
+lib64unibreak-devel
 lib64usb-compat0.1-devel
 lib64usb1.0-devel
 lib64utempter0
@@ -187,6 +188,9 @@ lib64xxf86dga-devel
 lib64xxf86vm-devel
 lib64wrap-devel
 librsvg
+libwebp-devel
+libxt-devel
+libxv-devel
 lm_sensors-devel
 mysql-devel
 nas-devel
@@ -217,7 +221,9 @@ perl(Tk)
 perl(XML::Parser)
 pilot-link-devel
 pinentry-gtk2
+pkgconfig(ao)
 pkgconfig(audiofile)
+pkgconfig(libgssglue)
 pkgconfig(libpng16)
 postgresql
 postgresql-devel