Merge branch 'master' into f27

This commit is contained in:
Ondrej Zoder 2018-07-10 13:27:52 +02:00
commit 1d55a59366
3 changed files with 10 additions and 5 deletions

2
.gitignore vendored
View File

@ -302,3 +302,5 @@ firefox-3.6.4.source.tar.bz2
/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 /firefox-langpacks-61.0-20180622.tar.xz
/firefox-61.0.1.source.tar.xz
/firefox-langpacks-61.0.1-20180710.tar.xz

View File

@ -102,13 +102,13 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 61.0 Version: 61.0.1
Release: 4%{?pre_tag}%{?dist} Release: 1%{?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}-20180622.tar.xz Source1: firefox-langpacks-%{version}%{?pre_version}-20180710.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
* Tue Jul 10 2018 Ondrej Zoder <ozoder@redhat.com> - 61.0.1
- Update to 61.0.1
* Mon Jun 25 2018 Martin Stransky <stransky@redhat.com> - 61.0-4 * Mon Jun 25 2018 Martin Stransky <stransky@redhat.com> - 61.0-4
- Disabled mozbz#1424422 as it's broken. - Disabled mozbz#1424422 as it's broken.

View File

@ -1,2 +1,2 @@
SHA512 (firefox-61.0.source.tar.xz) = 5a3c2a15109159becbf983616edb3f86ce7a0b44bf1918c98c4f45ae3604cd6d105c2023e7706bc5de73c0901447415bf7697bb2dd41745490004feeaf48c139 SHA512 (firefox-61.0.1.source.tar.xz) = 0395ac164450b394852aa8370c1c99538e12c43a9fa13d386831477379bf0498f0a68b08fac6ea01c044245247f53b8dd323c94ccd8e3dc7182f084be8c74915
SHA512 (firefox-langpacks-61.0-20180622.tar.xz) = 722292eed7d4545e069a12feacc984df5a35506e5843069529513f6b87a2fc73076677837dc390ab71726e4371d52021c5ba66c2b6f6bffaf8918f858dae0ff6 SHA512 (firefox-langpacks-61.0.1-20180710.tar.xz) = 239404a245611876accc8c88c86123e75ab9364a3d2b28d146876d504966d8c85cfe804dc8330681fc73fae1f3c8a7c2acb26d2cd3ae33fe35f00f2c0e771820