From f8bafd4154cbdd74ced78170008809f97b377efc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Simon=20Fauteux-Chapleau?= <francois-simon.fauteux-chapleau@savoirfairelinux.com> Date: Tue, 15 Apr 2025 17:57:58 -0400 Subject: [PATCH] packaging: remove Fedora 37 and 38 (EOL) Change-Id: I8d25303236781cad8f97b2f6f35ee159d814cdb6 --- extras/packaging/gnu-linux/Makefile | 2 - .../gnu-linux/docker/Dockerfile_fedora_37 | 106 ------------------ .../gnu-linux/docker/Dockerfile_fedora_38 | 106 ------------------ .../gnu-linux/scripts/build-package-rpm.sh | 6 - 4 files changed, 220 deletions(-) delete mode 100644 extras/packaging/gnu-linux/docker/Dockerfile_fedora_37 delete mode 100644 extras/packaging/gnu-linux/docker/Dockerfile_fedora_38 diff --git a/extras/packaging/gnu-linux/Makefile b/extras/packaging/gnu-linux/Makefile index 3fffad934..1eb205371 100644 --- a/extras/packaging/gnu-linux/Makefile +++ b/extras/packaging/gnu-linux/Makefile @@ -168,8 +168,6 @@ DISTRIBUTIONS := \ ubuntu_24.04 \ ubuntu_24.10 \ ubuntu_25.04 \ - fedora_37 \ - fedora_38 \ fedora_39 \ fedora_40 \ fedora_41 \ diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_37 b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_37 deleted file mode 100644 index 790222e5e..000000000 --- a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_37 +++ /dev/null @@ -1,106 +0,0 @@ -FROM fedora:37 - -RUN dnf clean all -RUN dnf update -y - -RUN dnf install -y dnf-command\(builddep\) rpmdevtools && \ - dnf install -y mock - -RUN dnf groupinstall -y "X Software Development" - -RUN dnf install -y \ - git \ - rpm-build \ - tar \ - make \ - autoconf \ - automake \ - nasm \ - speexdsp-devel \ - pulseaudio-libs-devel \ - libcanberra-devel \ - libcurl-devel \ - libtool \ - mesa-libgbm-devel \ - mesa-dri-drivers \ - dbus-devel \ - expat-devel \ - pcre-devel \ - yaml-cpp-devel \ - libXext-devel \ - libXfixes-devel \ - yasm \ - python2.7 \ - python3-html5lib \ - speex-devel \ - gsm-devel \ - chrpath \ - check \ - astyle \ - uuid-c++-devel \ - gettext-devel \ - gcc-c++ \ - which \ - alsa-lib-devel \ - systemd-devel \ - libuuid-devel \ - uuid-devel \ - gnutls-devel \ - nettle-devel \ - opus-devel \ - patch \ - jsoncpp-devel \ - libnatpmp-devel \ - webkitgtk4-devel \ - cryptopp-devel \ - libva-devel \ - libvdpau-devel \ - msgpack-devel \ - NetworkManager-libnm-devel \ - openssl-devel \ - clutter-devel \ - clutter-gtk-devel \ - libappindicator-gtk3-devel \ - libnotify-devel \ - libupnp-devel \ - qrencode-devel \ - libargon2-devel \ - libsndfile-devel \ - libdrm \ - gperf \ - bison \ - clang \ - clang-devel \ - llvm-devel \ - nodejs \ - flex \ - gstreamer1 gstreamer1-devel \ - gstreamer1-plugins-base-devel \ - gstreamer1-plugins-good \ - gstreamer1-plugins-bad-free-devel \ - nss-devel \ - libxcb* \ - libxkb* \ - libX11-devel \ - vulkan-devel \ - libXrender-devel \ - xcb-util-* \ - xz \ - xkeyboard-config \ - libnotify \ - wget \ - libstdc++-static \ - sqlite-devel \ - perl-generators \ - perl-English \ - libxshmfence-devel \ - ninja-build \ - clang \ - cmake \ - fmt-devel \ - pipewire-devel \ - cups-devel #Chromium for Qt - -ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh - -CMD ["/opt/build-package-rpm.sh"] diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_38 b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_38 deleted file mode 100644 index 33684f753..000000000 --- a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_38 +++ /dev/null @@ -1,106 +0,0 @@ -FROM fedora:38 - -RUN dnf clean all -RUN dnf update -y - -RUN dnf install -y dnf-command\(builddep\) rpmdevtools && \ - dnf install -y mock - -RUN dnf groupinstall -y "X Software Development" - -RUN dnf install -y \ - git \ - rpm-build \ - tar \ - make \ - autoconf \ - automake \ - nasm \ - speexdsp-devel \ - pulseaudio-libs-devel \ - libcanberra-devel \ - libcurl-devel \ - libtool \ - mesa-libgbm-devel \ - mesa-dri-drivers \ - dbus-devel \ - expat-devel \ - pcre-devel \ - yaml-cpp-devel \ - libXext-devel \ - libXfixes-devel \ - yasm \ - python2.7 \ - speex-devel \ - gsm-devel \ - chrpath \ - check \ - astyle \ - uuid-c++-devel \ - gettext-devel \ - gcc-c++ \ - which \ - alsa-lib-devel \ - systemd-devel \ - libuuid-devel \ - uuid-devel \ - gnutls-devel \ - nettle-devel \ - opus-devel \ - patch \ - jsoncpp-devel \ - libnatpmp-devel \ - webkitgtk4-devel \ - cryptopp-devel \ - libva-devel \ - libvdpau-devel \ - msgpack-devel \ - NetworkManager-libnm-devel \ - openssl-devel \ - clutter-devel \ - clutter-gtk-devel \ - libappindicator-gtk3-devel \ - libnotify-devel \ - libupnp-devel \ - qrencode-devel \ - libargon2-devel \ - libsndfile-devel \ - libdrm \ - gperf \ - bison \ - clang \ - clang-devel \ - llvm-devel \ - nodejs \ - flex \ - gstreamer1 gstreamer1-devel \ - gstreamer1-plugins-base-devel \ - gstreamer1-plugins-good \ - gstreamer1-plugins-bad-free-devel \ - nss-devel \ - libxcb* \ - libxkb* \ - libX11-devel \ - vulkan-devel \ - libXrender-devel \ - xcb-util-* \ - xz \ - xkeyboard-config \ - libnotify \ - wget \ - libstdc++-static \ - sqlite-devel \ - perl-generators \ - perl-English \ - libxshmfence-devel \ - ninja-build \ - clang \ - cmake \ - fmt-devel \ - python3-html5lib \ - cups-devel \ - pipewire-devel - -ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh - -CMD ["/opt/build-package-rpm.sh"] diff --git a/extras/packaging/gnu-linux/scripts/build-package-rpm.sh b/extras/packaging/gnu-linux/scripts/build-package-rpm.sh index f67b26cf1..7c0e07840 100755 --- a/extras/packaging/gnu-linux/scripts/build-package-rpm.sh +++ b/extras/packaging/gnu-linux/scripts/build-package-rpm.sh @@ -101,12 +101,6 @@ if [ ! -f "${RPM_PATH}" ]; then # Cache the built Qt RPM package. if [[ "${DISTRIBUTION:0:4}" == "rhel" ]]; then cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.el8.x86_64.rpm "${RPM_PATH}" - elif [[ "${DISTRIBUTION}" == "fedora_36" ]]; then - cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc36.x86_64.rpm "${RPM_PATH}" - elif [[ "${DISTRIBUTION}" == "fedora_37" ]]; then - cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc37.x86_64.rpm "${RPM_PATH}" - elif [[ "${DISTRIBUTION}" == "fedora_38" ]]; then - cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc38.x86_64.rpm "${RPM_PATH}" elif [[ "${DISTRIBUTION}" == "fedora_39" ]]; then cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc39.x86_64.rpm "${RPM_PATH}" elif [[ "${DISTRIBUTION}" == "fedora_40" ]]; then -- GitLab