Merge branch 'master' into f26

This commit is contained in:
Martin Stransky 2017-09-27 13:08:23 +02:00
commit 997b43d3a0
3 changed files with 8 additions and 6 deletions

1
.gitignore vendored
View File

@ -248,3 +248,4 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-55.0.3-20170901.tar.xz
/firefox-56.0.source.tar.xz
/firefox-langpacks-56.0-20170925.tar.xz
/firefox-langpacks-56.0-20170927.tar.xz

View File

@ -99,13 +99,13 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 56.0
Release: 1%{?pre_tag}%{?dist}
Release: 2%{?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}-20170925.tar.xz
Source1: firefox-langpacks-%{version}%{?pre_version}-20170927.tar.xz
%endif
Source10: firefox-mozconfig
Source12: firefox-redhat-default-prefs.js
@ -206,6 +206,7 @@ BuildRequires: pkgconfig(icu-i18n)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: yasm
BuildRequires: llvm-devel
BuildRequires: clang-libs
Requires: mozilla-filesystem
Requires: p11-kit-trust
@ -864,8 +865,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
* Mon Sep 25 2017 Martin Stransky <stransky@redhat.com> - 56.0-1
- Update to 56.0 (B4)
* Mon Sep 25 2017 Martin Stransky <stransky@redhat.com> - 56.0-2
- Update to 56.0 (B6)
* Fri Sep 15 2017 Martin Stransky <stransky@redhat.com> - 55.0.3-4
- Added switch to build mozbz#1399611 and disable it now

View File

@ -1,2 +1,2 @@
SHA512 (firefox-56.0.source.tar.xz) = f187f1c2efa8b6405715780726928812bc330590041cb86cdf62b7aa54dc9a513cb68098aa3f0c0bcd21c006225a68a0a8bb34a4de7ee526059f87e2126ae37d
SHA512 (firefox-langpacks-56.0-20170925.tar.xz) = 3696b8ac7857fe378dd5f5c77953fa1ebff1e6be1888f4265b2a149d33283572a522f6f57da78837a90818fa121c5eb9c3e314a841652e9c26bc372c526fedad
SHA512 (firefox-56.0.source.tar.xz) = 3aeb0ff54e10c83894f61734daa4f0801a1bb499d4667adad9c78520e588eae809d0e4d61e9227206466d62c3b453e2ce9ca8198f59f5354cd1b6804c00f0990
SHA512 (firefox-langpacks-56.0-20170927.tar.xz) = e74d85410891b6faa388d37043d764a6c01a2c83479d9912aa3d0b23684ed66ca639eb3cdb579cafef6c3156b0d774a66987a605e0f9e25c2d4eed967ef7b627