Merge branch 'master' into f26

This commit is contained in:
Martin Stransky 2018-03-17 15:33:01 +01:00
commit 30da399223
3 changed files with 11 additions and 6 deletions

2
.gitignore vendored
View File

@ -282,3 +282,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-59.0-20180306.tar.xz
/c61f5f5ead48c78a80c80db5c489bdc7cfaf8175.tar.bz2
/firefox-langpacks-59.0-20180312.tar.xz
/firefox-langpacks-59.0.1-20180317.tar.xz
/3db9e3d52b17563efca181ccbb50deb8660c59ae.tar.bz2

View File

@ -80,7 +80,7 @@
%global mozappdir %{_libdir}/%{name}
%global mozappdirdev %{_libdir}/%{name}-devel-%{version}
%global langpackdir %{mozappdir}/langpacks
%global release_hash c61f5f5ead48c78a80c80db5c489bdc7cfaf8175
%global release_hash 3db9e3d52b17563efca181ccbb50deb8660c59ae
%global tarballdir mozilla-release-%{release_hash}
%global official_branding 1
@ -95,13 +95,13 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 59.0
Release: 4%{?pre_tag}%{?dist}
Version: 59.0.1
Release: 1%{?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}-20180312.tar.xz
Source1: firefox-langpacks-%{version}%{?pre_version}-20180317.tar.xz
%endif
Source10: firefox-mozconfig
Source12: firefox-redhat-default-prefs.js
@ -844,6 +844,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
* Sat Mar 17 2018 Martin Stransky <stransky@redhat.com> - 59.0.1-1
- Updated to 59.0.1
* Wed Mar 14 2018 Martin Stransky <stransky@redhat.com> - 59.0-4
- Fixed broken langpacks.

View File

@ -1,2 +1,2 @@
SHA512 (c61f5f5ead48c78a80c80db5c489bdc7cfaf8175.tar.bz2) = 7f3555ad2b107e24ed49b5b57a30a33689f328511435bb3a0ee61cabd5057f422d728cf5b52bee4cf526b14f31c16c7f9a3c54795eefa5f79355ac10911e7ab6
SHA512 (firefox-langpacks-59.0-20180312.tar.xz) = 0ad5d2bf39482ec552bb9272c593ab75d10c78756abf2270403745d68ebe735d5042b685ded861798cfeb1335f9e65d3125b3453dd42f1cd57d1ce6f2d2c43d9
SHA512 (firefox-langpacks-59.0.1-20180317.tar.xz) = d7a8a0d75447df125450db6acb30568c3741153a8ec9a42f7ec53f74257eb486b7236c6487e5dcd63bba4b56eea024c7f18de76f59e19852894f29a7a6a398d8
SHA512 (3db9e3d52b17563efca181ccbb50deb8660c59ae.tar.bz2) = 5c1a5e19db6c08091d2c50b5763a7f0542d9d28bf5fc5d293f29b74764df38f4963d3eb96f3b7ecca2e980000e3e52ba2daf442bcd4ae87a69aa94d8aebea1da