From 1dd745d446bf46246a6e8affacd881ed7391d261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Simon=20Fauteux-Chapleau?= Date: Tue, 17 Jun 2025 13:17:25 -0400 Subject: [PATCH] packaging: remove EOL distributions GitLab: #2064 Change-Id: I566936c16512e7cc3db085a362fbd30f32bb693f --- extras/packaging/gnu-linux/Makefile | 3 - .../gnu-linux/docker/Dockerfile_fedora_39 | 105 ---------------- .../gnu-linux/docker/Dockerfile_fedora_40 | 105 ---------------- .../docker/Dockerfile_opensuse-leap_15.5 | 117 ------------------ .../packaging/gnu-linux/rules/rpm/jami.spec | 9 -- .../gnu-linux/scripts/build-package-rpm.sh | 4 - 6 files changed, 343 deletions(-) delete mode 100644 extras/packaging/gnu-linux/docker/Dockerfile_fedora_39 delete mode 100644 extras/packaging/gnu-linux/docker/Dockerfile_fedora_40 delete mode 100644 extras/packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.5 diff --git a/extras/packaging/gnu-linux/Makefile b/extras/packaging/gnu-linux/Makefile index 96ad7baf..6227a3d5 100644 --- a/extras/packaging/gnu-linux/Makefile +++ b/extras/packaging/gnu-linux/Makefile @@ -169,12 +169,9 @@ DISTRIBUTIONS := \ ubuntu_24.04 \ ubuntu_24.10 \ ubuntu_25.04 \ - fedora_39 \ - fedora_40 \ fedora_41 \ fedora_42 \ alma_9 \ - opensuse-leap_15.5 \ opensuse-leap_15.6 \ snap diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_39 b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_39 deleted file mode 100644 index fde510dd..00000000 --- a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_39 +++ /dev/null @@ -1,105 +0,0 @@ -FROM fedora:39 - -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 \ - 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.10 \ - 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/docker/Dockerfile_fedora_40 b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_40 deleted file mode 100644 index 7f217747..00000000 --- a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_40 +++ /dev/null @@ -1,105 +0,0 @@ -FROM fedora:40 - -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 \ - 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.10 \ - 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/docker/Dockerfile_opensuse-leap_15.5 b/extras/packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.5 deleted file mode 100644 index 711e03cb..00000000 --- a/extras/packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.5 +++ /dev/null @@ -1,117 +0,0 @@ -FROM opensuse/leap:15.5 - -RUN zypper --gpg-auto-import-keys refresh - -RUN zypper --non-interactive install -y \ - dnf \ - dnf-command\(builddep\) \ - rpmdevtools \ - Mesa-dri-devel Mesa-dri \ - git \ - gcc10 \ - gcc10-c++ \ - rpm-build \ - tar \ - make \ - autoconf \ - automake \ - nasm \ - speexdsp-devel \ - libpulse-devel \ - libcanberra-devel \ - libcurl-devel \ - libtool \ - pcre-devel \ - yaml-cpp-devel \ - libXext-devel \ - libXfixes-devel \ - yasm \ - speex-devel \ - libgsm-devel \ - chrpath \ - check \ - astyle \ - gettext-devel \ - which \ - alsa-lib-devel \ - systemd-devel \ - libuuid-devel \ - uuid-devel \ - libopus-devel \ - patch \ - jsoncpp-devel \ - webkit2gtk3-devel \ - libcryptopp-devel \ - libva-devel \ - libvdpau-devel \ - msgpack-c-devel \ - msgpack-cxx-devel \ - clutter-devel \ - openssl-devel \ - clutter-gtk-devel \ - libnma-devel \ - libcryptopp-devel \ - libexpat-devel \ - gnome-icon-theme-symbolic \ - libgsm-devel \ - gtk3-devel \ - libappindicator-devel \ - sqlite-devel \ - ffmpeg-4-libavutil-devel \ - gtk3-devel\ - qrencode-devel \ - python310 \ - python3-python-dateutil \ - python3-html5lib \ - libsndfile-devel \ - libdrm \ - gperf \ - bison \ - flex \ - ffmpeg ffmpeg-devel \ - nodejs20 \ - mozilla-nss-devel \ - python-xml \ - python3-six \ - python3-importlib-metadata \ - libxcb* \ - libxkb* \ - libX11-devel \ - libXrender-devel \ - libfreetype6 \ - xcb-util-image-devel \ - xcb-util-keysyms-devel \ - xcb-util-renderutil-devel \ - xcb-util-wm-devel \ - xorg-x11-devel \ - xz \ - xkeyboard-config \ - libnotify \ - argon2-devel \ - libxshmfence-devel \ - xproto-devel \ - xcb-proto-devel \ - xcb-* \ - xorg-* \ - vulkan-devel \ - ninja \ - gstreamer-devel \ - gstreamer-plugins-good \ - gstreamer-plugins-bad-devel \ - gstreamer-plugins-base-devel \ - cmake \ - wget \ - pipewire-devel - -# openSUSE Leap 15.5 comes with Python 3.6 by default, -# but we need at least 3.7 to compile Qt 6.6.1 -RUN rm /usr/bin/python3 && ln -s /usr/bin/python3.10 /usr/bin/python3 - -RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 50 -RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 50 - -ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh - -ENV CC=gcc -ENV CXX=g++ -CMD ["/opt/build-package-rpm.sh"] diff --git a/extras/packaging/gnu-linux/rules/rpm/jami.spec b/extras/packaging/gnu-linux/rules/rpm/jami.spec index 37148ebe..5fcf87f9 100644 --- a/extras/packaging/gnu-linux/rules/rpm/jami.spec +++ b/extras/packaging/gnu-linux/rules/rpm/jami.spec @@ -1,16 +1,7 @@ %define name jami %define version RELEASE_VERSION %define release 0 - -# The AppStream 1.0 spec says that the catalog file must be put in /usr/share/swcatalog/xml -# (see https://www.freedesktop.org/software/appstream/docs/chap-CatalogData.html). -# -# However, openSUSE Leap still uses the legacy path /usr/share/app-info/xmls as of version 15.5. -%if 0%{?sle_version} && 0%{?sle_version} <= 150500 -%define appstream_catalog_dir /share/app-info/xmls -%else %define appstream_catalog_dir /share/swcatalog/xml -%endif # Exclude vendored Qt6 from dependency generator %define __requires_exclude ^libQt6.*$ diff --git a/extras/packaging/gnu-linux/scripts/build-package-rpm.sh b/extras/packaging/gnu-linux/scripts/build-package-rpm.sh index ac107b1f..07183ad2 100755 --- a/extras/packaging/gnu-linux/scripts/build-package-rpm.sh +++ b/extras/packaging/gnu-linux/scripts/build-package-rpm.sh @@ -101,10 +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_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 - cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc40.x86_64.rpm "${RPM_PATH}" elif [[ "${DISTRIBUTION}" == "fedora_41" ]]; then cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc41.x86_64.rpm "${RPM_PATH}" elif [[ "${DISTRIBUTION}" == "fedora_42" ]]; then