Merge branch 'master' into f26

This commit is contained in:
Jan Horak 2017-08-14 08:08:42 +02:00
commit 56cde5a461
3 changed files with 10 additions and 5 deletions

2
.gitignore vendored
View File

@ -240,3 +240,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-55.0.source.tar.xz /firefox-55.0.source.tar.xz
/firefox-langpacks-55.0-20170802.tar.xz /firefox-langpacks-55.0-20170802.tar.xz
/firefox-langpacks-55.0-20170807.tar.xz /firefox-langpacks-55.0-20170807.tar.xz
/firefox-55.0.1.source.tar.xz
/firefox-langpacks-55.0.1-20170814.tar.xz

View File

@ -96,14 +96,14 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 55.0 Version: 55.0.1
Release: 6%{?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+
Group: Applications/Internet Group: Applications/Internet
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}-20170807.tar.xz Source1: firefox-langpacks-%{version}%{?pre_version}-20170814.tar.xz
%endif %endif
Source10: firefox-mozconfig Source10: firefox-mozconfig
Source12: firefox-redhat-default-prefs.js Source12: firefox-redhat-default-prefs.js
@ -852,6 +852,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Mon Aug 14 2017 Jan Horak <jhorak@redhat.com> - 55.0.1-1
- Update to 55.0.1
* Fri Aug 11 2017 Jan Horak <jhorak@redhat.com> - 55.0-6 * Fri Aug 11 2017 Jan Horak <jhorak@redhat.com> - 55.0-6
- Do not require nss and nspr which we build package against - Do not require nss and nspr which we build package against

View File

@ -1,2 +1,2 @@
SHA512 (firefox-langpacks-55.0-20170807.tar.xz) = 7710d37859edfddb6e252ca8edb309b5ae59fc392e5a848525722bd77c5765c79e1a0f092a5d6f96021539153afd0ca962cf8b8de2c3f94b94c89768dc9a2cf7 SHA512 (firefox-55.0.1.source.tar.xz) = 2c15cb3e1a9f464f63ff7ac8ccf0625ed845a5cb9b186d7acf121c439cec38bcdeee93630e99dbfd336f1b7e60a7c09822a1eba59f308bba8866f155b2ed1c47
SHA512 (firefox-55.0.source.tar.xz) = b3ca0a926faedfc12c859965629330489ac6c05730a0dc38748704a1a25e876decfba78a3d665e22a6773b0a3bfed3109cd624be77d130785b4097d6d9f9c94b SHA512 (firefox-langpacks-55.0.1-20170814.tar.xz) = e2b00456718dcb7462622af7abf5f8672bffffd1f26d3a43487e2490f2d1fb5b858df22f0e5326f8bcb4f0035554782d39f93d90356466ef81fce0bc82a80d25