Merge branch 'master' into f27

This commit is contained in:
Martin Stransky 2018-06-19 22:38:18 +02:00
commit 497421afbe

View File

@ -73,7 +73,7 @@
# we're building against could bring us some broken dependencies from time to time. # we're building against could bring us some broken dependencies from time to time.
#%global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536) #%global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536)
%global nspr_build_version %{nspr_version} %global nspr_build_version %{nspr_version}
%global nss_version 3.36.1 %global nss_version 3.37.3
#%global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536) #%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 %{nss_version}
%endif %endif