Merge branch 'master' into f26

This commit is contained in:
Jan Horak 2018-01-03 11:55:34 +01:00
commit 6312583d3b
3 changed files with 14 additions and 6 deletions

2
.gitignore vendored
View File

@ -270,3 +270,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-57.0-20171113.tar.xz
/firefox-57.0.1.source.tar.xz
/firefox-langpacks-57.0.1-20171130.tar.xz
/firefox-57.0.3.source.tar.xz
/firefox-langpacks-57.0.3-20180102.tar.xz

View File

@ -1,4 +1,4 @@
%if 0%{?fedora} < 26
%if 0%{?fedora} < 26 || 0%{?fedora} > 27
ExcludeArch: armv7hl
%endif
@ -92,21 +92,19 @@ ExcludeArch: armv7hl
%global enable_mozilla_crashreporter 0
%if !%{debug_build}
%ifarch %{ix86} x86_64
%if 0%{?fedora} < 27
%global enable_mozilla_crashreporter 1
%endif
%endif
%endif
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 57.0.1
Release: 2%{?pre_tag}%{?dist}
Version: 57.0.3
Release: 1%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
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}-20171130.tar.xz
Source1: firefox-langpacks-%{version}%{?pre_version}-20180102.tar.xz
%endif
Source10: firefox-mozconfig
Source12: firefox-redhat-default-prefs.js
@ -860,6 +858,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
* Tue Jan 2 2018 Jan Horak <jhorak@redhat.com> - 57.0.3-1
- Update to 57.0.3
* Fri Dec 08 2017 Kevin Fenzi <kevin@scrye.com> - 57.0.1-3
- Temp disable armv7 for rawhide to get composes working again. rhbz#1523912
* Mon Dec 4 2017 Martin Stransky <stransky@redhat.com> - 57.0.1-2
- Added new man page by Tobias Girstmair (rhbz#1334025)

View File

@ -1,2 +1,4 @@
SHA512 (firefox-57.0.1.source.tar.xz) = 8cbfe0ad2c0f935dbc3a0ac4e855c489c83bf8c4506815dbae6e27f5d6a262ecf19ac82b6e81d52782559834fa14403116ecbf3acc8e3bc56b6c319e68316edd
SHA512 (firefox-langpacks-57.0.1-20171130.tar.xz) = c91536fecb56686f8976e611e43129585927b35cd55360722aa9db5d13f16fd8474be256b751b66f36160046029671702da60a66c39d083d9c28b37571c74ad0
SHA512 (firefox-57.0.3.source.tar.xz) = 1f887ab6bb16ef69bce56b689e761b3e09fc106b4bee7842be2c8e7eac05981f9922e9c3a8bd22b4935545cbbc10bf0a0c79df7800cd3c80fd4137070c9bfd09
SHA512 (firefox-langpacks-57.0.3-20180102.tar.xz) = 8422976c309840a18e5f3b69a47a42c00b99032df97c4851cf04c2d4d04af0924caf93e8df00d52fae912f362eb31263231536b9cbe18c1238c191e017416953