Merge branch 'master' into f27

This commit is contained in:
Martin Stransky 2018-05-07 16:36:30 +02:00
commit 4125f0985f
3 changed files with 8 additions and 4 deletions

1
.gitignore vendored
View File

@ -294,3 +294,4 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-60.0b16-20180427.tar.xz /firefox-langpacks-60.0b16-20180427.tar.xz
/firefox-60.0.source.tar.xz /firefox-60.0.source.tar.xz
/firefox-langpacks-60.0-20180502.tar.xz /firefox-langpacks-60.0-20180502.tar.xz
/firefox-langpacks-60.0-20180507.tar.xz

View File

@ -102,12 +102,12 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 60.0 Version: 60.0
Release: 3%{?pre_tag}%{?dist} Release: 4%{?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
%if %{build_langpacks} %if %{build_langpacks}
Source1: firefox-langpacks-%{version}%{?pre_version}-20180502.tar.xz Source1: firefox-langpacks-%{version}%{?pre_version}-20180507.tar.xz
%endif %endif
Source10: firefox-mozconfig Source10: firefox-mozconfig
Source12: firefox-redhat-default-prefs.js Source12: firefox-redhat-default-prefs.js
@ -873,6 +873,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Thu May 3 2018 Martin Stransky <stransky@redhat.com> - 60.0-4
- Updated to Firefox 60 build 2
* Thu May 3 2018 Martin Stransky <stransky@redhat.com> - 60.0-3 * Thu May 3 2018 Martin Stransky <stransky@redhat.com> - 60.0-3
- Added patch from mozbz#1375074 - fixes aarch64 baseline JIT crashes - Added patch from mozbz#1375074 - fixes aarch64 baseline JIT crashes

View File

@ -1,2 +1,2 @@
SHA512 (firefox-60.0.source.tar.xz) = a1a57d2f5e25f90d0efac1e5fbe6443b078c1892e7b26a56691df8c13874fa843be7d56005950b00d4251fa4e7b1cb45af567a4a0e7b1c4b7b8d370f4154d325 SHA512 (firefox-60.0.source.tar.xz) = 63c156238a6b6b6188f093d2658d3152cd0ff6a1e275dd819a6d111dd4f964cac548632f45cd0f561b17537cde2740afe681e28d5a4d69477d9f39030567a0fc
SHA512 (firefox-langpacks-60.0-20180502.tar.xz) = 135d09cb322b05a91e04b0a6ac2e5fb311e821d2b0f3db84b667fde0b44ff7faac49ad628a22c0f97d9810d4ee36311168c47b77b11b34df4cf21af483dac452 SHA512 (firefox-langpacks-60.0-20180507.tar.xz) = 864e709ebea3469dff37913919d3355b4bcae2fade76194d536f5e3acc2987a6490205bdd5b37199dda50c754c8824dc54bedd91632c346edd213b4af135b3b8