From 51b361d7b1cd0360dd8b25936a57f4932998ffc5 Mon Sep 17 00:00:00 2001
From: jeff200902 <jeff200902@163.com>
Date: Sat, 28 Nov 2020 15:20:34 +0800
Subject: [PATCH] fix downgrade error

---
 firefox.spec | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/firefox.spec b/firefox.spec
index bcf9378..f511fcf 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -32,9 +32,9 @@
 %endif
 %global pgo_wayland       0
 %endif
-%global wayland_backend_default 1
+%global wayland_backend_default 0
 %if 0%{?flatpak}
-%global wayland_backend_default 1
+%global wayland_backend_default 0
 %global build_with_pgo    0
 %endif
 %ifarch ppc64 s390x
@@ -88,7 +88,7 @@
 Summary:             Mozilla Firefox Web browser
 Name:                firefox
 Version:             79.0
-Release:             2
+Release:             3
 URL:                 https://www.mozilla.org/firefox/
 License:             MPLv1.1 or GPLv2+ or LGPLv2+
 Source0:             https://archive.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz
@@ -200,8 +200,8 @@ BuildRequires:       rust cargo clang-devel
 BuildRequires:       libasan libasan-static
 %endif
 BuildRequires:       perl-interpreter
-Obsoletes:           mozilla <= 37:1.7.13
-Provides:            webclient
+Provides:            webclient firefox-wayland = %{version}-%{release}
+Obsoletes:           mozilla <= 37:1.7.13 firefox-wayland <= %{version}-%{release}
 %description
 Mozilla Firefox is an open-source web browser, designed for standards
 compliance, performance and portability.
@@ -236,17 +236,6 @@ to run Firefox explicitly on X11.
 %{_bindir}/firefox-x11
 %{_datadir}/applications/firefox-x11.desktop
 %endif
-
-%package wayland
-Summary:             Firefox Wayland launcher.
-Requires:            %{name}
-%description wayland
-The firefox-wayland package contains launcher and desktop file
-to run Firefox explicitly on Wayland.
-
-%files wayland
-%{_bindir}/firefox-wayland
-%{_datadir}/applications/firefox-wayland.desktop
 %if %{run_tests}
 %global testsuite_pkg_name mozilla-%{name}-testresults
 
@@ -680,6 +669,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
 %{_bindir}/firefox
+%{_bindir}/firefox-wayland
 %{mozappdir}/firefox
 %{mozappdir}/firefox-bin
 %doc %{_mandir}/man1/*
@@ -712,6 +702,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/32x32/apps/firefox.png
 %{_datadir}/icons/hicolor/48x48/apps/firefox.png
 %{_datadir}/icons/hicolor/symbolic/apps/firefox-symbolic.svg
+%{_datadir}/applications/firefox-wayland.desktop
 %if %{enable_mozilla_crashreporter}
 %{mozappdir}/crashreporter
 %{mozappdir}/crashreporter.ini
@@ -737,6 +728,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+
+* Thu Nov 28 2020 Jeffery.Gao <gaojianxing@huawei.com> - 79.0-3
+- Fix firefox downgrade error
+
 * Thu Oct 29 2020 caodongxia <caodongxia@huawei.com> - 79.0-2
 - Fix firefox remove warning
 
-- 
Gitee