Merge branch 'master' into f24

This commit is contained in:
Martin Stransky 2016-05-03 10:53:15 +02:00
commit 87555df7b2
3 changed files with 10 additions and 5 deletions

2
.gitignore vendored
View File

@ -191,3 +191,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-45.0.2-20160411.tar.xz
/firefox-46.0.source.tar.xz
/firefox-langpacks-46.0-20160425.tar.xz
/firefox-46.0.1.source.tar.xz
/firefox-langpacks-46.0.1-20160503.tar.xz

View File

@ -91,14 +91,14 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 46.0
Release: 6%{?pre_tag}%{?dist}
Version: 46.0.1
Release: 1%{?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}-20160425.tar.xz
Source1: firefox-langpacks-%{version}%{?pre_version}-20160503.tar.xz
%endif
Source10: firefox-mozconfig
Source12: firefox-redhat-default-prefs.js
@ -801,6 +801,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
* Tue May 3 2016 Martin Stransky <stransky@redhat.com> - 46.0.1-1
- Updated to 46.0.1
* Mon May 2 2016 Martin Stransky <stransky@redhat.com> - 46.0-6
- Removed gstreamer config as it's no longer used.
See rhbz#1331496 for details.

View File

@ -1,2 +1,2 @@
8a516da3858b17f55451810efc7a239a firefox-46.0.source.tar.xz
a3d5dfc93c9e657908319a2c21212e69 firefox-langpacks-46.0-20160425.tar.xz
3e3b90268b8a634f7c60a25eb3a04c8c firefox-46.0.1.source.tar.xz
d9382a0655c29f9278ffc5cf22fb9e77 firefox-langpacks-46.0.1-20160503.tar.xz