Merge branch 'master' into f26

This commit is contained in:
Martin Stransky 2018-03-12 12:08:54 +01:00
commit d206a226a6
3 changed files with 8 additions and 6 deletions

4
.gitignore vendored
View File

@ -279,4 +279,6 @@ firefox-3.6.4.source.tar.bz2
/firefox-58.0.1.source.tar.xz
/firefox-langpacks-58.0.1-20180130.tar.xz
/2f6a4d2cf42c9d59626061d45c043817cb220814.tar.bz2
/firefox-langpacks-59.0-20180306.tar.xz
/firefox-langpacks-59.0-20180306.tar.xz
/c61f5f5ead48c78a80c80db5c489bdc7cfaf8175.tar.bz2
/firefox-langpacks-59.0-20180312.tar.xz

View File

@ -80,7 +80,7 @@
%global mozappdir %{_libdir}/%{name}
%global mozappdirdev %{_libdir}/%{name}-devel-%{version}
%global langpackdir %{mozappdir}/langpacks
%global release_hash 2f6a4d2cf42c9d59626061d45c043817cb220814
%global release_hash c61f5f5ead48c78a80c80db5c489bdc7cfaf8175
%global tarballdir mozilla-release-%{release_hash}
%global official_branding 1
@ -96,12 +96,12 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 59.0
Release: 1%{?pre_tag}%{?dist}
Release: 2%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://hg.mozilla.org/releases/mozilla-release/archive/%{release_hash}.tar.bz2
%if %{build_langpacks}
Source1: firefox-langpacks-%{version}%{?pre_version}-20180306.tar.xz
Source1: firefox-langpacks-%{version}%{?pre_version}-20180312.tar.xz
%endif
Source10: firefox-mozconfig
Source12: firefox-redhat-default-prefs.js

View File

@ -1,2 +1,2 @@
SHA512 (2f6a4d2cf42c9d59626061d45c043817cb220814.tar.bz2) = 78d7e6da9062cdf0883097fa5bbad7c7db3f9b28dae9413e1ed880f34bb9fbfd9b2524b2c25fbca55bcf796b5023c42131758bf5bdee6c404e572bc751287215
SHA512 (firefox-langpacks-59.0-20180306.tar.xz) = 7eda70eca83679581ef3e015e066f9d1a338bf7aab54f3f851a04d68d3155190d5e03cafca1f9716ff33648d78fec74ec07c2041a9a81c7aed5f8649ca367712
SHA512 (c61f5f5ead48c78a80c80db5c489bdc7cfaf8175.tar.bz2) = 7f3555ad2b107e24ed49b5b57a30a33689f328511435bb3a0ee61cabd5057f422d728cf5b52bee4cf526b14f31c16c7f9a3c54795eefa5f79355ac10911e7ab6
SHA512 (firefox-langpacks-59.0-20180312.tar.xz) = 0ad5d2bf39482ec552bb9272c593ab75d10c78756abf2270403745d68ebe735d5042b685ded861798cfeb1335f9e65d3125b3453dd42f1cd57d1ce6f2d2c43d9