Merge branch 'master' into f26

This commit is contained in:
Martin Stransky 2017-10-24 11:14:27 +02:00
commit eb074c692a
3 changed files with 10 additions and 5 deletions

2
.gitignore vendored
View File

@ -259,3 +259,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-57.0b8-20171016.tar.xz
/firefox-57.0b9.source.tar.xz
/firefox-langpacks-57.0b9-20171019.tar.xz
/firefox-57.0b11.source.tar.xz
/firefox-langpacks-57.0b11-20171024.tar.xz

View File

@ -81,7 +81,7 @@ ExcludeArch: armv7hl
%global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
%endif
%define pre_version b9
%define pre_version b11
%global mozappdir %{_libdir}/%{name}
%global mozappdirdev %{_libdir}/%{name}-devel-%{version}
@ -103,13 +103,13 @@ ExcludeArch: armv7hl
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 57.0
Release: 0.5%{?pre_tag}%{?dist}
Release: 0.6%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
%if %{build_langpacks}
Source1: firefox-langpacks-%{version}%{?pre_version}-20171019.tar.xz
Source1: firefox-langpacks-%{version}%{?pre_version}-20171024.tar.xz
%endif
Source10: firefox-mozconfig
Source12: firefox-redhat-default-prefs.js
@ -860,6 +860,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
* Thu Oct 24 2017 Martin Stransky <stransky@redhat.com> - 57.0-0.6
- Updated to 57.0 Beta 11
* Thu Oct 19 2017 Martin Stransky <stransky@redhat.com> - 57.0-0.5
- Updated to 57.0 Beta 9

View File

@ -1,2 +1,2 @@
SHA512 (firefox-57.0b9.source.tar.xz) = 5d09a07ae48198de8d8ada4018afb4c1cfe16d9294bbbd502d3f23915c43496604f19761a409a41a23ec712d622a556b0b6dc9efd186f4528724e52c8305dda1
SHA512 (firefox-langpacks-57.0b9-20171019.tar.xz) = 07a3182edf634a5151e4c599e9f8a886e286c1e708f5743db10efeeb5526b4aa120153491da926c5bfcd69cb0e683ff83f2637fca53c78b9e256151768c20712
SHA512 (firefox-57.0b11.source.tar.xz) = 2f63af3d7a02229938b937bc4dd9024a030ebab336959d488c42cc69a1a31ec1441cd446082c19873e57941cd70f97def1230ee05cb15a7e2fb217cdc3aae389
SHA512 (firefox-langpacks-57.0b11-20171024.tar.xz) = 0afcefe82d0f54d7186d354b9b9909118df33ea96ec7c878bf7fbb1f64f12bd742430a9bdcb99c660133aa7de9f91a1dd7232bf7ef92193f629ff88bb861d9e5