Merge branch 'master' into f26

This commit is contained in:
Martin Stransky 2017-10-30 11:05:11 +01:00
commit fa9ab467b8
3 changed files with 10 additions and 5 deletions

2
.gitignore vendored
View File

@ -261,3 +261,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-57.0b9-20171019.tar.xz
/firefox-57.0b11.source.tar.xz
/firefox-langpacks-57.0b11-20171024.tar.xz
/firefox-57.0b12.source.tar.xz
/firefox-langpacks-57.0b12-20171030.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 b11
%define pre_version b12
%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.6%{?pre_tag}%{?dist}
Release: 0.7%{?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}-20171024.tar.xz
Source1: firefox-langpacks-%{version}%{?pre_version}-20171030.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
* Mon Oct 30 2017 Martin Stransky <stransky@redhat.com> - 57.0-0.7
- Updated to 57.0 Beta 12
* Tue Oct 24 2017 Martin Stransky <stransky@redhat.com> - 57.0-0.6
- Updated to 57.0 Beta 11

View File

@ -1,2 +1,2 @@
SHA512 (firefox-57.0b11.source.tar.xz) = 2f63af3d7a02229938b937bc4dd9024a030ebab336959d488c42cc69a1a31ec1441cd446082c19873e57941cd70f97def1230ee05cb15a7e2fb217cdc3aae389
SHA512 (firefox-langpacks-57.0b11-20171024.tar.xz) = 0afcefe82d0f54d7186d354b9b9909118df33ea96ec7c878bf7fbb1f64f12bd742430a9bdcb99c660133aa7de9f91a1dd7232bf7ef92193f629ff88bb861d9e5
SHA512 (firefox-57.0b12.source.tar.xz) = 1fb5616f2d8d5129ea9c25edd9f05b8591bc269a472f55ca17f2cc55bbbb046802c5f940b9ebb1f0cd0a781c51e37fabed4760af94986b69276b793e47522b47
SHA512 (firefox-langpacks-57.0b12-20171030.tar.xz) = 2b7cd4e2d32a6819633ad854f267e7c76dfc6a3e9ffba955567f971eff7f204eaba761f666e201bf2c3989806aedd3704c4b80ea039bee4ca53dc55190f987c9