Merge branch 'master' into f23

This commit is contained in:
Martin Stransky 2016-06-06 11:51:54 +02:00
commit fff61b8db2
3 changed files with 9 additions and 4 deletions

1
.gitignore vendored
View File

@ -196,3 +196,4 @@ firefox-3.6.4.source.tar.bz2
/firefox-47.0.source.tar.xz /firefox-47.0.source.tar.xz
/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

View File

@ -85,13 +85,13 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 47.0 Version: 47.0
Release: 3%{?pre_tag}%{?dist} Release: 4%{?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}-20160603.tar.xz Source1: firefox-langpacks-%{version}%{?pre_version}-20160606.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,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Mon Jun 6 2016 Martin Stransky <stransky@redhat.com> - 47.0-4
- Updated to 47.0 (B3)
- Should fix rhbz#1338010 (rebuilt against new astronomy-bookmarks)
* Fri Jun 3 2016 Martin Stransky <stransky@redhat.com> - 47.0-3 * Fri Jun 3 2016 Martin Stransky <stransky@redhat.com> - 47.0-3
- Updated to 47.0 (B2) - Updated to 47.0 (B2)

View File

@ -1,2 +1,2 @@
77acb4e3104e977adc30e3e42b5cc2b5 firefox-47.0.source.tar.xz 0bd5991a6c821dd1a34ead0f8bbb301a firefox-47.0.source.tar.xz
5e48ae9dc788a21cbc43153c4a1446dc firefox-langpacks-47.0-20160603.tar.xz 3a4727f2277b93991efece0d9aed070b firefox-langpacks-47.0-20160606.tar.xz