Merge branch 'master' into f23
This commit is contained in:
commit
91cb8fa676
1
.gitignore
vendored
1
.gitignore
vendored
@ -195,3 +195,4 @@ firefox-3.6.4.source.tar.bz2
|
||||
/firefox-langpacks-46.0.1-20160503.tar.xz
|
||||
/firefox-47.0.source.tar.xz
|
||||
/firefox-langpacks-47.0-20160601.tar.xz
|
||||
/firefox-langpacks-47.0-20160603.tar.xz
|
||||
|
@ -85,13 +85,13 @@
|
||||
Summary: Mozilla Firefox Web browser
|
||||
Name: firefox
|
||||
Version: 47.0
|
||||
Release: 2%{?pre_tag}%{?dist}
|
||||
Release: 3%{?pre_tag}%{?dist}
|
||||
URL: https://www.mozilla.org/firefox/
|
||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
Group: Applications/Internet
|
||||
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
|
||||
%if %{build_langpacks}
|
||||
Source1: firefox-langpacks-%{version}%{?pre_version}-20160601.tar.xz
|
||||
Source1: firefox-langpacks-%{version}%{?pre_version}-20160603.tar.xz
|
||||
%endif
|
||||
Source10: firefox-mozconfig
|
||||
Source12: firefox-redhat-default-prefs.js
|
||||
@ -789,6 +789,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
#---------------------------------------------------------------------
|
||||
|
||||
%changelog
|
||||
* Fri Jun 3 2016 Martin Stransky <stransky@redhat.com> - 47.0-3
|
||||
- Updated to 47.0 (B2)
|
||||
|
||||
* Thu Jun 2 2016 Martin Stransky <stransky@redhat.com> - 47.0-2
|
||||
- Updated to 47.0
|
||||
- Backout of negotiate authentication patch
|
||||
|
Loading…
Reference in New Issue
Block a user