From 7a812b899e9817b0086fec1b349ce6660a68efea Mon Sep 17 00:00:00 2001 From: David Ward Date: Fri, 30 Mar 2018 22:31:32 -0400 Subject: [PATCH] Install module in both NSS shared database and NSS legacy database --- opensc.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/opensc.spec b/opensc.spec index a155a80..676303e 100644 --- a/opensc.spec +++ b/opensc.spec @@ -111,9 +111,11 @@ rm -rf %{buildroot}%{_mandir}/man1/npa-tool.1* /sbin/ldconfig isThere=`modutil -rawlist -dbdir %{nssdb} | grep %{opensc_module} || echo NO` if [ "$isThere" == "NO" ]; then - if [ -x %{_bindir}/pk11install ]; then - modutil -dbdir %{nssdb} -add %{opensc_module} -libfile opensc-pkcs11.so -force ||: - fi + modutil -dbdir %{nssdb} -add %{opensc_module} -libfile opensc-pkcs11.so -force ||: +fi +isThere=`modutil -rawlist -dbdir sql:%{nssdb} | grep %{opensc_module} || echo NO` +if [ "$isThere" == "NO" ]; then + modutil -dbdir sql:%{nssdb} -add %{opensc_module} -libfile opensc-pkcs11.so -force ||: fi %postun @@ -123,6 +125,10 @@ if [ $1 -eq 0 ]; then if [ ! "$isThere" == "NO" ]; then modutil -delete %{opensc_module} -dbdir %{nssdb} -force || : fi + isThere=`modutil -rawlist -dbdir sql:%{nssdb} | grep %{opensc_module} || echo NO` + if [ ! "$isThere" == "NO" ]; then + modutil -delete %{opensc_module} -dbdir sql:%{nssdb} -force || : + fi fi %files