This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository buildscripts.
commit 50b72891a2ba7250c6808a35287e95fb1c07560c
Author: Mihai Moldovan <io...@ionic.de>
Date: Thu Dec 15 03:43:20 2016 +0100
bin/build-rpm-package: fix signing i386 EPEL5 packages.
For some reason we need %{__gpg} in the V3 signature macro, even though
we are and have to also reference /usr/bin/gpg.
Otherwise signatures come out as V4.
---
bin/build-rpm-package | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index dc713dc..18d4590 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -982,7 +982,7 @@ build_packages() {
find
"${PKGDIST}/${l_DIST}/${l_CODENAME}/i386" -type 'f' -iname '*.src.rpm' -exec rm
-f -- '{}' \;
if [
"${l_DIST}" = "epel" ] && [ "${l_CODENAME}" = "5" ]; then
-
RPMMACRO_V3SIGN="%__gpg_sign_cmd /usr/bin/gpg --force-v3-sigs
--digest-algo=sha1 --batch --no-verbose --no-armor --passphrase-fd 3
--no-secmem-warning -u \"%_gpg_name\" -sbo %{__signature_filename}
%{__plaintext_filename}"
+
RPMMACRO_V3SIGN="%__gpg_sign_cmd %{__gpg} /usr/bin/gpg --force-v3-sigs
--digest-algo=sha1 --batch --no-verbose --no-armor --passphrase-fd 3
--no-secmem-warning -u \"%_gpg_name\" -sbo %{__signature_filename}
%{__plaintext_filename}"
rpmsign-unattended -D "%_gpg_name ${GPG_KEY_EPEL5}" -D "${RPMMACRO_V3SIGN}"
--addsign "${PKGDIST}/${l_DIST}/${l_CODENAME}/i386/"*.rpm
[
"x${SIGN_SRPM}" = "x1" ] && rpmsign-unattended -D "%_gpg_name ${GPG_KEY_EPEL5}"
-D "${RPMMACRO_V3SIGN}" --addsign
"${PKGDIST}/${l_DIST}/${l_CODENAME}/SRPM/"*.rpm
else
--
Alioth's
/srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on
/srv/git/code.x2go.org/buildscripts.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits
