Merge branch 'master' into f26

This commit is contained in:
Jan Horak 2017-07-25 13:23:47 +02:00
commit 3792c5194e
3 changed files with 10 additions and 5 deletions

2
.gitignore vendored
View File

@ -235,3 +235,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-54.0.source.tar.xz /firefox-54.0.source.tar.xz
/firefox-langpacks-54.0-20170608.tar.xz /firefox-langpacks-54.0-20170608.tar.xz
/firefox-langpacks-54.0-20170613.tar.xz /firefox-langpacks-54.0-20170613.tar.xz
/firefox-54.0.1.source.tar.xz
/firefox-langpacks-54.0.1-20170725.tar.xz

View File

@ -93,14 +93,14 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 54.0 Version: 54.0.1
Release: 2%{?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+
Group: Applications/Internet Group: Applications/Internet
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
%if %{build_langpacks} %if %{build_langpacks}
Source1: firefox-langpacks-%{version}%{?pre_version}-20170613.tar.xz Source1: firefox-langpacks-%{version}%{?pre_version}-20170725.tar.xz
%endif %endif
Source10: firefox-mozconfig Source10: firefox-mozconfig
Source12: firefox-redhat-default-prefs.js Source12: firefox-redhat-default-prefs.js
@ -848,6 +848,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Tue Jul 25 2017 Jan Horak <jhorak@redhat.com> - 54.0.1-1
- Update to 54.0.1
* Tue Jun 13 2017 Jan Horak <jhorak@redhat.com> - 54.0-2 * Tue Jun 13 2017 Jan Horak <jhorak@redhat.com> - 54.0-2
- Update to 54.0 (B3) - Update to 54.0 (B3)

View File

@ -1,2 +1,2 @@
SHA512 (firefox-54.0.source.tar.xz) = 0ff6960804e7f6d3e15faeb14b237fee45acae31b4652a6cc5cafa1a1b1eab3537616c3e8ea6d8f3109c87dcc8f86f0df3da2627903b80061c8a62fb11598ed9 SHA512 (firefox-54.0.1.source.tar.xz) = 43607c2c0af995a21dc7f0f68b24b7e5bdb3faa5ee06025901c826bfe4d169256ea1c9eb5fcc604c4d6426ced53e80787c12fc07cda014eca09199ef3df783a2
SHA512 (firefox-langpacks-54.0-20170613.tar.xz) = 7936b97945ce2c6f893158458a6f9611dc964ed0c13258641fbba504ce057525668d6a86c8535682349a7a4d22d9ceb6b52f2295c80a4ec19e5133ac2d0be0ae SHA512 (firefox-langpacks-54.0.1-20170725.tar.xz) = 1e861c56cd431008b833bee770631745d9690af8bff6e54fd332e845cd08658bb33c5fb6fd50fb3549634a5dffc119a8e00d13e8468b9ab55bd905db8ecaf41b