Merge branch 'master' into f26

This commit is contained in:
Martin Stransky 2017-11-06 13:33:41 +01:00
commit 5b540f5cf7
3 changed files with 10 additions and 5 deletions

2
.gitignore vendored
View File

@ -263,3 +263,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-57.0b11-20171024.tar.xz
/firefox-57.0b12.source.tar.xz
/firefox-langpacks-57.0b12-20171030.tar.xz
/firefox-57.0b14.source.tar.xz
/firefox-langpacks-57.0b14-20171106.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 b12
%define pre_version b14
%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.8%{?pre_tag}%{?dist}
Release: 0.9%{?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}-20171030.tar.xz
Source1: firefox-langpacks-%{version}%{?pre_version}-20171106.tar.xz
%endif
Source10: firefox-mozconfig
Source12: firefox-redhat-default-prefs.js
@ -867,6 +867,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
* Mon Nov 6 2017 Martin Stransky <stransky@redhat.com> - 57.0-0.9
- Updated to 57.0 Beta 14
* Mon Oct 30 2017 Martin Stransky <stransky@redhat.com> - 57.0-0.8
- Updated to 57.0 Beta 12

View File

@ -1,2 +1,2 @@
SHA512 (firefox-57.0b12.source.tar.xz) = 1fb5616f2d8d5129ea9c25edd9f05b8591bc269a472f55ca17f2cc55bbbb046802c5f940b9ebb1f0cd0a781c51e37fabed4760af94986b69276b793e47522b47
SHA512 (firefox-langpacks-57.0b12-20171030.tar.xz) = 2b7cd4e2d32a6819633ad854f267e7c76dfc6a3e9ffba955567f971eff7f204eaba761f666e201bf2c3989806aedd3704c4b80ea039bee4ca53dc55190f987c9
SHA512 (firefox-57.0b14.source.tar.xz) = 15c00c0cd8591128d122616b152320e5ac589c29ffe863fa0c5b683fdbfaa9ec794ce687e324e9e689066951acb3f126607005bf31d344436501699996e7b24d
SHA512 (firefox-langpacks-57.0b14-20171106.tar.xz) = 73f193178f66908276a5c4bcfb0916dd536d30a0caad1a1a118cf25f5054eadb421bc592000cf63c8a7cee2c1133a6e6cee6976b4f228320b5a62bc0bbfda900