Merge branch 'master' into f26

This commit is contained in:
Martin Stransky 2018-05-02 12:44:49 +02:00
commit 94a7312181
3 changed files with 5 additions and 4 deletions

2
.gitignore vendored
View File

@ -292,3 +292,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-60.0b15-20180426.tar.xz
/firefox-60.0b16.source.tar.xz
/firefox-langpacks-60.0b16-20180427.tar.xz
/firefox-60.0.source.tar.xz
/firefox-langpacks-60.0-20180502.tar.xz

View File

@ -84,7 +84,6 @@
%global official_branding 1
%global build_langpacks 1
%global pre_version b16
%global enable_mozilla_crashreporter 0
%if !%{debug_build}
@ -96,7 +95,7 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 60.0
Release: 0.5%{?pre_tag}%{?dist}
Release: 1%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%{version}%{?pre_version}.source.tar.xz

View File

@ -1,2 +1,2 @@
SHA512 (firefox-60.0b16.source.tar.xz) = 06fb60779e54f11a8e0e3f6c5950808da81cbb723175a58ccfe7d172799319acc2b7cdaaf221c7debea94dca74e1ab3ae1bdb60ee2d90a75a03fdd251855d8f4
SHA512 (firefox-langpacks-60.0b16-20180427.tar.xz) = 6e284b5ee5446aeefa945689670719d60b4dcff908e5655c0c9dd8b31bfe7d4ae0724698fc2483addb9b1e1519685183371fe10e3f0b5dcba85a9a43b7f2cd43
SHA512 (firefox-60.0.source.tar.xz) = a1a57d2f5e25f90d0efac1e5fbe6443b078c1892e7b26a56691df8c13874fa843be7d56005950b00d4251fa4e7b1cb45af567a4a0e7b1c4b7b8d370f4154d325
SHA512 (firefox-langpacks-60.0-20180502.tar.xz) = 135d09cb322b05a91e04b0a6ac2e5fb311e821d2b0f3db84b667fde0b44ff7faac49ad628a22c0f97d9810d4ee36311168c47b77b11b34df4cf21af483dac452