[packages/nss] move ecc/noecc copy to %prep

atler atler at pld-linux.org
Mon Nov 14 01:40:06 CET 2022


commit 2fdd22fda9e0214d84a4ba885d28b2fa6e85fc80
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Nov 14 00:39:59 2022 +0100

    move ecc/noecc copy to %prep
    
    avoids copying in short-circuit which was not even correct (in
    sub-sequent short-circuit build cp -a nss $dir/nss would copy nss into
    $dir/nss/nss)

 nss.spec | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/nss.spec b/nss.spec
index 646ced0..2081bbc 100644
--- a/nss.spec
+++ b/nss.spec
@@ -112,6 +112,12 @@ Biblioteka kryptograficzna freebl dla bibliotek NSS.
 %{__sed} -i -e '/export ADDON_PATH$/a\    echo STRIP \; %{__strip} --strip-unneeded -R.comment -R.note ${5}' nss/cmd/shlibsign/sign.sh
 %endif
 
+# http://pki.fedoraproject.org/wiki/ECC_Capable_NSS
+for dir in ecc noecc; do
+	install -d $dir
+	cp -a nss $dir
+done
+
 %build
 %if %{without bootstrap}
 # http://wiki.cacert.org/wiki/NSSLib
@@ -122,12 +128,6 @@ addbuiltin -n "CAcert Inc." -t "CT,C,C" < %{SOURCE3} >> nss/lib/ckfw/builtins/ce
 export USE_64=1
 %endif
 
-# http://pki.fedoraproject.org/wiki/ECC_Capable_NSS
-for dir in ecc noecc; do
-	install -d $dir
-	cp -a nss $dir/nss
-done
-
 export BUILD_OPT=1
 export MOZILLA_CLIENT=1
 export NSDISTMODE=copy
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nss.git/commitdiff/569dea7ccff1c671411a5d614495c5a8799a36b0



More information about the pld-cvs-commit mailing list