fix references to nvr library

Sanity/pkcsslotd-to-create-lock-and-log-directories/main.fmf

@@ -8,9 +8,7 @@ component:
 test: ./runtest.sh
 framework: beakerlib
 require:
-- library(distribution/nvr)
-#- url: https://github.com/beakerlib/nvr.git
-#  name: /nvr
+- library(nvr/nvr)
 - url: https://src.fedoraproject.org/tests/opencryptoki.git
   name: /Library/token-manipulation
 recommend:

Sanity/pkcsslotd-to-create-lock-and-log-directories/runtest.sh

@@ -41,7 +41,7 @@ rlIsRHEL '<7' && LOCKDIR=/var/lock
 rlJournalStart
     rlPhaseStartSetup
         rlAssertRpm $PACKAGE
-        rlRun "rlImport nvr" || rlDie "cannot import nvr library"
+        rlRun "rlImport nvr/nvr" || rlDie "cannot import nvr library"
         rlRun "rlImport opencryptoki/token-manipulation" 2> import.log || rlDie "Could not import opencryptoki/token-manipulation library"
         # need library path so we can import it as a test user
         LIBPATH=`grep 'Will try to import opencryptoki\/token-manipulation from' import.log | sed 's/^.*token-manipulation from//'`