Merge branch 'master' into epel7

knot.spec

@@ -80,8 +80,11 @@ The package contains documentation for the Knot DNS server.
 On-line version is available on https://www.knot-dns.cz/documentation/
 
 %prep
-gpg2 --import --import-options import-export,import-minimal %{SOURCE1000} > ./gpg-keyring.gpg
-gpgv2 --keyring ./gpg-keyring.gpg %{SOURCE1} %{SOURCE0}
+export GNUPGHOME=./gpg-keyring
+mkdir ${GNUPGHOME}
+gpg2 --import %{SOURCE1000}
+gpg2 --verify %{SOURCE1} %{SOURCE0}
+
 %setup -q
 
 # make sure embedded LMDB library is not used