From 919e30e38fad68ea0ae59954f09ae5b833cab02a Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 29 Jan 2024 09:55:29 +0100 Subject: [PATCH] Obsolete firefox-wayland and firefox-x11 on Fedora 40+ --- firefox.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/firefox.spec b/firefox.spec index b37802b..f446894 100644 --- a/firefox.spec +++ b/firefox.spec @@ -174,7 +174,7 @@ ExcludeArch: i686 Summary: Mozilla Firefox Web browser Name: firefox Version: 122.0 -Release: 1%{?pre_tag}%{?dist} +Release: 2%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz @@ -496,6 +496,13 @@ to run Firefox explicitly on Wayland. %{_datadir}/applications/firefox-wayland.desktop %endif +# Don't ship firefox-x11 and firefox-wayland on Fedora 40. +# Wayland backend is considered as mature enough now. +%if 0%{?fedora} >= 40 +Obsoletes: firefox-wayland +Obsoletes: firefox-x11 +%endif + %if 0%{?run_firefox_tests} %global testsuite_pkg_name %{name}-testresults %package -n %{testsuite_pkg_name} @@ -1170,6 +1177,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Jan 29 2024 Martin Stransky - 122.0-2 +- Obsolete firefox-wayland and firefox-x11 on Fedora 40+ + * Fri Jan 19 2024 Martin Stransky - 122.0-1 - Update to 122.0