Merge branch 'master' into f26

This commit is contained in:
Martin Stransky 2018-01-30 22:10:46 +01:00
commit ebc32e9266
3 changed files with 10 additions and 3 deletions

2
.gitignore vendored
View File

@ -276,3 +276,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-57.0.4-20180104.tar.xz /firefox-langpacks-57.0.4-20180104.tar.xz
/firefox-58.0.source.tar.xz /firefox-58.0.source.tar.xz
/firefox-langpacks-58.0-20180123.tar.xz /firefox-langpacks-58.0-20180123.tar.xz
/firefox-58.0.1.source.tar.xz
/firefox-langpacks-58.0.1-20180130.tar.xz

View File

@ -94,13 +94,13 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 58.0 Version: 58.0.1
Release: 4%{?pre_tag}%{?dist} Release: 1%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/ URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ 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 Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
%if %{build_langpacks} %if %{build_langpacks}
Source1: firefox-langpacks-%{version}%{?pre_version}-20180123.tar.xz Source1: firefox-langpacks-%{version}%{?pre_version}-20180130.tar.xz
%endif %endif
Source10: firefox-mozconfig Source10: firefox-mozconfig
Source12: firefox-redhat-default-prefs.js Source12: firefox-redhat-default-prefs.js
@ -873,6 +873,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Tue Jan 30 2018 Martin Stransky <stransky@redhat.com> - 58.0.1-1
- Update to 58.0.1
* Wed Jan 24 2018 Martin Stransky <stransky@redhat.com> - 58.0-4 * Wed Jan 24 2018 Martin Stransky <stransky@redhat.com> - 58.0-4
- Enabled second arches - Enabled second arches

View File

@ -1,2 +1,4 @@
SHA512 (firefox-58.0.source.tar.xz) = 17a2c520973c68c5dd130bcb27407b1c20b03f74c97aeb486e86d422ab5c012e549787ae53275d6840b9d324f261ae282b98f61764ee5e0a6df1cc3e3c9e2632 SHA512 (firefox-58.0.source.tar.xz) = 17a2c520973c68c5dd130bcb27407b1c20b03f74c97aeb486e86d422ab5c012e549787ae53275d6840b9d324f261ae282b98f61764ee5e0a6df1cc3e3c9e2632
SHA512 (firefox-langpacks-58.0-20180123.tar.xz) = 6781bf0a5d68bdaa513f85404b8d9111bef8d2aa6d12e1b5fa8db2e4f44fce2d2642b9b5a70a6fc92f0cb96167f6895e17505bdc212aea987240cfb018f340f5 SHA512 (firefox-langpacks-58.0-20180123.tar.xz) = 6781bf0a5d68bdaa513f85404b8d9111bef8d2aa6d12e1b5fa8db2e4f44fce2d2642b9b5a70a6fc92f0cb96167f6895e17505bdc212aea987240cfb018f340f5
SHA512 (firefox-58.0.1.source.tar.xz) = 65a6a68f95dac93fc68c4e240742b172a6417e7fafca2671ab13f398329ba0ef3195bbaaecea2d9f8b2992217cfaa7912af6c0351a1efe4cf2d2bba838ecd711
SHA512 (firefox-langpacks-58.0.1-20180130.tar.xz) = 8f2dd980ce26dc9c18283b6e7200064804862a206082aea14772dc95f2a232b701679b7bff2d665f81ee96bbfa8b561ab51ab87ce3e82313e6e6197fcc804ed6