Merge branch 'master' into f24

This commit is contained in:
Martin Stransky 2016-07-11 12:29:34 +02:00
commit 5094b2f1ef
3 changed files with 10 additions and 5 deletions

2
.gitignore vendored
View File

@ -197,3 +197,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-47.0-20160601.tar.xz /firefox-langpacks-47.0-20160601.tar.xz
/firefox-langpacks-47.0-20160603.tar.xz /firefox-langpacks-47.0-20160603.tar.xz
/firefox-langpacks-47.0-20160606.tar.xz /firefox-langpacks-47.0-20160606.tar.xz
/firefox-47.0.1.source.tar.xz
/firefox-langpacks-47.0.1-20160711.tar.xz

View File

@ -84,14 +84,14 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 47.0 Version: 47.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}-20160606.tar.xz Source1: firefox-langpacks-%{version}%{?pre_version}-20160711.tar.xz
%endif %endif
Source10: firefox-mozconfig Source10: firefox-mozconfig
Source12: firefox-redhat-default-prefs.js Source12: firefox-redhat-default-prefs.js
@ -789,6 +789,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Mon Jul 11 2016 Martin Stransky <stransky@redhat.com> - 47.0.1-1
- Updated to 47.0.1
* Wed Jun 22 2016 Martin Stransky <stransky@redhat.com> - 47.0-6 * Wed Jun 22 2016 Martin Stransky <stransky@redhat.com> - 47.0-6
- Updated tooltip patch for 3.20 - Updated tooltip patch for 3.20

View File

@ -1,2 +1,2 @@
0bd5991a6c821dd1a34ead0f8bbb301a firefox-47.0.source.tar.xz aba4b673b10e3fdcee80f88300829613 firefox-47.0.1.source.tar.xz
3a4727f2277b93991efece0d9aed070b firefox-langpacks-47.0-20160606.tar.xz 906516a1111d2fd6ebf902d8ff1a6cd7 firefox-langpacks-47.0.1-20160711.tar.xz