Merge branch 'master' into f26

This commit is contained in:
Martin Stransky 2018-05-02 13:12:48 +02:00
commit 11da098d41

View File

@ -95,7 +95,7 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 60.0 Version: 60.0
Release: 1%{?pre_tag}%{?dist} Release: 2%{?pre_tag}%{?dist}
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://hg.mozilla.org/releases/mozilla-release/archive/firefox-%{version}%{?pre_version}.source.tar.xz Source0: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%{version}%{?pre_version}.source.tar.xz
@ -854,6 +854,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Wed May 2 2018 Martin Stransky <stransky@redhat.com> - 60.0-2
- Update to Firefox 60 build 1
- Ship firefox-wayland launch script
* Mon Apr 30 2018 Martin Stransky <stransky@redhat.com> - 60.0-0.5 * Mon Apr 30 2018 Martin Stransky <stransky@redhat.com> - 60.0-0.5
- Build with Wayland backend enabled. - Build with Wayland backend enabled.