Merge branch 'master' into f26
This commit is contained in:
commit
a8f593c240
@ -97,7 +97,7 @@
|
||||
Summary: Mozilla Firefox Web browser
|
||||
Name: firefox
|
||||
Version: 55.0.2
|
||||
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
|
||||
@ -250,9 +250,6 @@ BuildRequires: cargo
|
||||
Obsoletes: mozilla <= 37:1.7.13
|
||||
Provides: webclient
|
||||
|
||||
#remove when nspr 4.16 is at stable
|
||||
Conflicts: pkgconfig(nspr) >= 4.16
|
||||
|
||||
%description
|
||||
Mozilla Firefox is an open-source web browser, designed for standards
|
||||
compliance, performance and portability.
|
||||
@ -856,6 +853,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
#---------------------------------------------------------------------
|
||||
|
||||
%changelog
|
||||
* Thu Aug 24 2017 Martin Stransky <stransky@redhat.com> - 55.0.2-3
|
||||
- Enable to build with nspr-4.16.
|
||||
|
||||
* Wed Aug 23 2017 Martin Stransky <stransky@redhat.com> - 55.0.2-2
|
||||
- Rebuilt to remove wrong dependency to nspr-4.16.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user