Merge branch 'master' into f27

This commit is contained in:
Martin Stransky 2018-06-22 10:20:50 +02:00
commit 2005f5b29f
3 changed files with 8 additions and 4 deletions

1
.gitignore vendored
View File

@ -301,3 +301,4 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-60.0.2-20180611.tar.xz /firefox-langpacks-60.0.2-20180611.tar.xz
/firefox-61.0.source.tar.xz /firefox-61.0.source.tar.xz
/firefox-langpacks-61.0-20180619.tar.xz /firefox-langpacks-61.0-20180619.tar.xz
/firefox-langpacks-61.0-20180622.tar.xz

View File

@ -103,12 +103,12 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 61.0 Version: 61.0
Release: 2%{?pre_tag}%{?dist} Release: 3%{?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}-20180619.tar.xz Source1: firefox-langpacks-%{version}%{?pre_version}-20180622.tar.xz
%endif %endif
Source10: firefox-mozconfig Source10: firefox-mozconfig
Source12: firefox-redhat-default-prefs.js Source12: firefox-redhat-default-prefs.js
@ -918,6 +918,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Fri Jun 22 2018 Martin Stransky <stransky@redhat.com> - 61.0-3
- Update to 61.0 Build 3
* Thu Jun 21 2018 Martin Stransky <stransky@redhat.com> - 61.0-2 * Thu Jun 21 2018 Martin Stransky <stransky@redhat.com> - 61.0-2
- Disabled system hunspell due to rhbz#1593494 - Disabled system hunspell due to rhbz#1593494

View File

@ -1,2 +1,2 @@
SHA512 (firefox-61.0.source.tar.xz) = 302d45639487975b4bf0ae4cdab3042f88b84f4de5ae5683555c0bd78e2bf6edaca6f1c0bc34753a7c9c96709f118e0d5ad8f9c6644f2e2c95347d79bacfd990 SHA512 (firefox-61.0.source.tar.xz) = 5a3c2a15109159becbf983616edb3f86ce7a0b44bf1918c98c4f45ae3604cd6d105c2023e7706bc5de73c0901447415bf7697bb2dd41745490004feeaf48c139
SHA512 (firefox-langpacks-61.0-20180619.tar.xz) = 4a6bf5394b5b054c45458179591e3b9c845f42aa974d405369fd6f6e75cb42ac09c15f8d87acd152f038bdeba0d058eda61b1ce9ff49e27fea26ed5cbbdedcb7 SHA512 (firefox-langpacks-61.0-20180622.tar.xz) = 722292eed7d4545e069a12feacc984df5a35506e5843069529513f6b87a2fc73076677837dc390ab71726e4371d52021c5ba66c2b6f6bffaf8918f858dae0ff6