Fix downgrade error

This commit is contained in:
jeff200902 2020-11-28 15:31:40 +08:00
parent 9bdbe64897
commit 12df1abada

View File

@ -32,9 +32,9 @@
%endif %endif
%global pgo_wayland 0 %global pgo_wayland 0
%endif %endif
%global wayland_backend_default 1 %global wayland_backend_default 0
%if 0%{?flatpak} %if 0%{?flatpak}
%global wayland_backend_default 1 %global wayland_backend_default 0
%global build_with_pgo 0 %global build_with_pgo 0
%endif %endif
%ifarch ppc64 s390x %ifarch ppc64 s390x
@ -88,7 +88,7 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 79.0 Version: 79.0
Release: 2 Release: 3
URL: https://www.mozilla.org/firefox/ URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz 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 BuildRequires: libasan libasan-static
%endif %endif
BuildRequires: perl-interpreter BuildRequires: perl-interpreter
Obsoletes: mozilla <= 37:1.7.13 Provides: webclient firefox-wayland = %{version}-%{release}
Provides: webclient Obsoletes: mozilla <= 37:1.7.13 firefox-wayland <= %{version}-%{release}
%description %description
Mozilla Firefox is an open-source web browser, designed for standards Mozilla Firefox is an open-source web browser, designed for standards
compliance, performance and portability. compliance, performance and portability.
@ -236,17 +236,6 @@ to run Firefox explicitly on X11.
%{_bindir}/firefox-x11 %{_bindir}/firefox-x11
%{_datadir}/applications/firefox-x11.desktop %{_datadir}/applications/firefox-x11.desktop
%endif %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} %if %{run_tests}
%global testsuite_pkg_name mozilla-%{name}-testresults %global testsuite_pkg_name mozilla-%{name}-testresults
@ -674,6 +663,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang %files -f %{name}.lang
%{_bindir}/firefox %{_bindir}/firefox
%{_bindir}/firefox-wayland
%{mozappdir}/firefox %{mozappdir}/firefox
%{mozappdir}/firefox-bin %{mozappdir}/firefox-bin
%doc %{_mandir}/man1/* %doc %{_mandir}/man1/*
@ -706,6 +696,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/icons/hicolor/32x32/apps/firefox.png %{_datadir}/icons/hicolor/32x32/apps/firefox.png
%{_datadir}/icons/hicolor/48x48/apps/firefox.png %{_datadir}/icons/hicolor/48x48/apps/firefox.png
%{_datadir}/icons/hicolor/symbolic/apps/firefox-symbolic.svg %{_datadir}/icons/hicolor/symbolic/apps/firefox-symbolic.svg
%{_datadir}/applications/firefox-wayland.desktop
%if %{enable_mozilla_crashreporter} %if %{enable_mozilla_crashreporter}
%{mozappdir}/crashreporter %{mozappdir}/crashreporter
%{mozappdir}/crashreporter.ini %{mozappdir}/crashreporter.ini
@ -731,6 +722,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%endif %endif
%changelog %changelog
* Thu Nov 28 2020 Jeffery.Gao <gaojianxing@huawei.com> - 79.0-3
- Fix firefox downgrade error
* Mon Oct 26 2020 lingsheng <lingsheng@huawei.com> - 79.0-2 * Mon Oct 26 2020 lingsheng <lingsheng@huawei.com> - 79.0-2
- Fix firefox remove warning - Fix firefox remove warning