RPM: update packaging for R14.1.5

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

2 files changed, 21 insertions, 15 deletions

diff --git a/redhat/docker/omvcooker/Dockerfile.x86_64 b/redhat/docker/omvcooker/Dockerfile.x86_64
index b237c4192..8cfeed1c4 100644
--- a/redhat/docker/omvcooker/Dockerfile.x86_64
+++ b/redhat/docker/omvcooker/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM openmandriva/cooker:latest
 
-ARG TDE_VERSION=14.1.4
+ARG TDE_VERSION=14.1.5
 ARG ARCH=x86_64
 
 COPY packages /packages
@@ -27,19 +27,19 @@ RUN set -x \
 USER trinity
 COPY rpmmacros /home/trinity/.rpmmacros
 
-RUN set -x \
- && 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 \
+# && 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 \
- && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/sword-1.9.0-13.mga10.src.rpm \
- && 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 \
+# && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/sword-1.9.0-13.mga10.src.rpm \
+# && 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/cauldron/SRPMS/core/release/yaz-5.34.4-2.mga10.src.rpm --define "mkrel %nil" --nodeps \
+ && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/yaz-5.35.1-1.mga10.src.rpm --define "mkrel %nil" --nodeps \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64yaz{5,-devel},yaz}-5*.rpm
 
 RUN set -x \
@@ -48,8 +48,12 @@ RUN set -x \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-2*.rpm
 
 RUN set -x \
- && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/cscope-15.9-3.mga9.src.rpm --define "mkrel %nil" \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cscope-15*.rpm
+ && rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/a/audiofile-0.3.6-36.el9.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/audiofile{,-devel}-0*.rpm
+
+#RUN set -x \
+# && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/cscope-15.9-3.mga9.src.rpm --define "mkrel %nil" \
+# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cscope-15*.rpm
 
 RUN set -x \
  && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-Getopt-ArgvFile-1.110.0-10.mga9.src.rpm \
diff --git a/redhat/docker/omvcooker/packages b/redhat/docker/omvcooker/packages
index 873ca4609..69b1c654f 100644
--- a/redhat/docker/omvcooker/packages
+++ b/redhat/docker/omvcooker/packages
@@ -15,6 +15,7 @@ clamav-devel
 cmake
 createrepo_c
 ctags
+cscope
 cups-devel
 curl-devel
 db5-devel
@@ -138,8 +139,7 @@ lib64npth-devel
 lib64nsl-devel
 lib64nspr-devel
 lib64ofx-devel
-lib64openexr-devel
-lib64otr-devel
+lib64lib64otr-devel
 lib64paper-devel
 lib64pcre-devel
 lib64pcsclite-devel
@@ -160,6 +160,7 @@ lib64sasl-devel
 lib64SDL-devel
 lib64smbclient-devel
 lib64sndfile-devel
+lib64sword-devel
 lib64t1lib-devel
 lib64tasn1-devel
 lib64theora-devel
@@ -236,6 +237,7 @@ python-pylibacl
 python-pyyaml
 python-setuptools_scm
 pyxattr
+rdesktop
 readline-devel
 recode
 rpm-build