rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into f26

Browse Source
This commit is contained in:
Jan Horak 2017-08-11 14:44:02 +02:00
commit c0e7c7ca8d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
firefox.spec
View File

@ -65,9 +65,13 @@
%if %{?system_nss} %if %{?system_nss}
%global nspr_version 4.10.10 %global nspr_version 4.10.10
%global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536) # NSS/NSPR quite often ends in build override, so as requirement the version
# we're building against could bring us some broken dependencies from time to time.
%global nspr_build_version %{nspr_version}
#%global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536)
%global nss_version 3.29.3 %global nss_version 3.29.3
%global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536) %global nss_build_version %{nss_version}
#%global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536)
%endif %endif
%if %{?system_sqlite} %if %{?system_sqlite}
@ -93,7 +97,7 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 55.0 Version: 55.0
Release: 5%{?pre_tag}%{?dist} Release: 6%{?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
@ -848,6 +852,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Fri Aug 11 2017 Jan Horak <jhorak@redhat.com> - 55.0-6
- Do not require nss and nspr which we build package against
* Tue Aug 8 2017 Martin Stransky <stransky@redhat.com> - 55.0-5 * Tue Aug 8 2017 Martin Stransky <stransky@redhat.com> - 55.0-5
- Rebuild - Rebuild