From 507a1cebf006f86f49275288355cb63586ab207f Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 26 Mar 2020 23:47:49 +0000 Subject: [PATCH] Use __make macro to invoke make Using the %__make macro makes it possible for an alternative buildroot to inject its own flags into the make invocation. This makes it easier to do trial rebuilds of fedora using different compilers or different compiler flags. --- nss.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/nss.spec b/nss.spec index 7546955..7848957 100644 --- a/nss.spec +++ b/nss.spec @@ -43,7 +43,7 @@ rpm.define(string.format("nss_release_tag NSS_%s_RTM", Summary: Network Security Services Name: nss Version: %{nss_version} -Release: 2%{?dist} +Release: 3%{?dist} License: MPLv2.0 URL: http://www.mozilla.org/projects/security/pki/nss/ Requires: nspr >= %{nspr_version} @@ -305,8 +305,8 @@ export USE_64=1 %endif %endif -make -C ./nss/coreconf -make -C ./nss/lib/dbm +%{__make} -C ./nss/coreconf +%{__make} -C ./nss/lib/dbm # Set the policy file location # if set NSS will always check for the policy file and load if it exists @@ -314,11 +314,11 @@ export POLICY_FILE="nss.config" # location of the policy file export POLICY_PATH="/etc/crypto-policies/back-ends" -make -C ./nss +%{__make} -C ./nss # build the man pages clean pushd ./nss -make clean_docs build_docs +%{__make} clean_docs build_docs popd # and copy them to the dist directory for %%install to find them @@ -889,6 +889,9 @@ update-crypto-policies &> /dev/null || : %changelog +* Thu Mar 26 2020 Tom Stellard - 3.50.0-3 +- Use __make macro to invoke make + * Thu Mar 5 2020 Daiki Ueno - 3.50.0-2 - Apply CMAC fixes from upstream