From 79e9e064950acffc9b840cd8697884b9d8e4feb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Fri, 10 May 2024 13:03:26 +0200 Subject: [PATCH] RPM: initial support for OMV cooker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- redhat/docker/omv5000/Dockerfile.x86_64 | 12 ++------- redhat/docker/omv5000/packages | 1 + redhat/docker/omvcooker/Dockerfile.x86_64 | 31 +++++++++++++++-------- redhat/docker/omvcooker/packages | 28 ++++++++++++++++++-- 4 files changed, 50 insertions(+), 22 deletions(-) diff --git a/redhat/docker/omv5000/Dockerfile.x86_64 b/redhat/docker/omv5000/Dockerfile.x86_64 index fa73aaa5b..37b186710 100644 --- a/redhat/docker/omv5000/Dockerfile.x86_64 +++ b/redhat/docker/omv5000/Dockerfile.x86_64 @@ -13,12 +13,6 @@ RUN set -x \ RUN set -x \ && chmod a+r /usr/libexec/utempter/utempter -# Prefer GCC over clang -#RUN set -x \ -# && ln -sfv ld.bfd /usr/bin/ld \ -# && ln -sfv g++ /usr/bin/c++ \ -# && ln -sfv gcc /usr/bin/cc - # Add non-root user to build packages RUN set -x \ && rm -rf /home/trinity \ @@ -37,8 +31,7 @@ RUN set -x \ RUN set -x \ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/sword-1.9.0-11.mga10.src.rpm \ - && sed -i ${HOME}/rpmbuild/SPECS/sword.spec -e "/pycache/d" \ - && 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 "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --define "_unpackaged_files_terminate_build %nil" --nodeps \ + && 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 \ @@ -47,8 +40,7 @@ RUN set -x \ 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 \ - && sed -i ${HOME}/rpmbuild/SPECS/rdiff-backup.spec -e "/pycache/d" \ - && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdiff-backup.spec --define "_unpackaged_files_terminate_build %nil" \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdiff-backup.spec \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-2*.rpm RUN set -x \ diff --git a/redhat/docker/omv5000/packages b/redhat/docker/omv5000/packages index 8b9af8cff..47a126218 100644 --- a/redhat/docker/omv5000/packages +++ b/redhat/docker/omv5000/packages @@ -40,6 +40,7 @@ freetype-devel fribidi-devel gamin-devel gettext-devel +ghostscript glib2-devel glibc-i18ndata gmime-devel diff --git a/redhat/docker/omvcooker/Dockerfile.x86_64 b/redhat/docker/omvcooker/Dockerfile.x86_64 index 410451b6a..55f8a0abf 100644 --- a/redhat/docker/omvcooker/Dockerfile.x86_64 +++ b/redhat/docker/omvcooker/Dockerfile.x86_64 @@ -31,24 +31,35 @@ RUN set -x \ RUN set -x \ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/sword-1.9.0-11.mga10.src.rpm \ - && sed -i ${HOME}/rpmbuild/SPECS/sword.spec -e "s/%mkrel //" -e "/pycache/d" \ - && 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 "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --define "_unpackaged_files_terminate_build %nil" --nodeps \ + && 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/9/SRPMS/core/release/yaz-5.34.0-1.mga9.src.rpm --nodeps \ -# && sed -i ${HOME}/rpmbuild/SPECS/yaz.spec -e "s/%mkrel //" \ -# && rpmbuild -bb ${HOME}/rpmbuild/SPECS/yaz.spec --nodeps \ +# && 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 \ && 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 \ - && sed -i ${HOME}/rpmbuild/SPECS/rdiff-backup.spec -e "s/%mkrel //" \ - && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdiff-backup.spec \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdiff-backup.spec --define "mkrel %nil" \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-2*.rpm RUN set -x \ - && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/cscope-15.9-3.mga9.src.rpm \ - && sed -i ${HOME}/rpmbuild/SPECS/cscope.spec -e "s/%mkrel //" \ - && rpmbuild -bb ${HOME}/rpmbuild/SPECS/cscope.spec \ + && 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 \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-Getopt-ArgvFile.spec --define "mkrel %nil" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-1.18.0-1.mga9.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s/MYMETA.yml//" \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR.spec --define "mkrel %nil" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-Packer-1.57.0-1.mga9.src.rpm \ + && 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 diff --git a/redhat/docker/omvcooker/packages b/redhat/docker/omvcooker/packages index 853e400e1..47a126218 100644 --- a/redhat/docker/omvcooker/packages +++ b/redhat/docker/omvcooker/packages @@ -40,6 +40,7 @@ freetype-devel fribidi-devel gamin-devel gettext-devel +ghostscript glib2-devel glibc-i18ndata gmime-devel @@ -68,6 +69,7 @@ lib64asound-devel lib64attr-devel lib64audio-devel lib64binutils-devel +lib64cap-devel lib64cdda-devel lib64cdio-devel lib64cdio_paranoia-devel @@ -86,6 +88,7 @@ lib64fbclient-devel lib64ffmpeg-devel lib64flac++-devel lib64flac-devel +lib64fluidsynth-devel lib64fontenc-devel lib64gadu-devel lib64geoip-devel @@ -105,6 +108,7 @@ lib64hiredis-devel lib64ical-devel lib64icu-devel lib64idn-devel +lib64ifp-devel lib64jack-devel lib64magick-devel lib64inotifytools-devel @@ -113,20 +117,28 @@ lib64jpeg-devel lib64lame-devel lib64lcms-devel lib64ldap-devel +lib64lirc_client-devel +lib64lo-devel +lib64lrdf-devel lib64ltdl-devel lib64lua-devel lib64mad-devel lib64magic-devel lib64memcached-devel lib64mng-devel +lib64mpcdec-devel +lib64mtp-devel lib64musicbrainz5-devel lib64nettle-devel +lib64njb-devel +lib64nm-devel lib64npth-devel -lib64nspr-devel lib64nsl-devel +lib64nspr-devel +lib64ofx-devel lib64openexr-devel +lib64otr-devel lib64paper-devel -lib64cap-devel lib64pcre-devel lib64pcsclite-devel lib64pkcs11-helper-devel @@ -135,6 +147,8 @@ lib64poppler-devel lib64pqxx-devel lib64pth-devel lib64pulseaudio-devel +lib64qalculate-devel +lib64raptor-devel lib64raw1394-devel lib64rsvg2-devel lib64rsync-devel @@ -143,6 +157,7 @@ lib64sane1-devel lib64sasl-devel lib64SDL-devel lib64smbclient-devel +lib64sndfile-devel lib64t1lib-devel lib64tasn1-devel lib64theora-devel @@ -156,8 +171,10 @@ lib64usb1.0-devel lib64utempter0 lib64utempter-devel lib64v4l-devel +lib64visual-devel lib64vorbis-devel lib64wmf-devel +lib64wpd-devel lib64xaw-devel lib64xdg-basedir-devel lib64xi-devel @@ -187,9 +204,16 @@ optipng pam-devel pciutils-devel perl-devel +perl(Archive::Zip) +perl(ExtUtils::CBuilder) +perl(ExtUtils::Embed) perl-ExtUtils-MakeMaker perl(IPC::Run3) +perl(Module::ScanDeps) +perl(PAR::Dist) perl-pcsc-perl +perl(Test::More) +perl(Tk) perl(XML::Parser) pilot-link-devel pinentry-gtk2