[X2Go-Commits] [buildscripts] 01/01: support v3 signature for epel-5 builds

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit d30bd4322f0f63ef36bf48fac129bb53207ec622
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 13 01:37:17 2014 +0100

    support v3 signature for epel-5 builds
---
 bin/build-rpm-package |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index d93928c..df9624c 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -284,7 +284,10 @@ build_packages() {
 						done
 						ls $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.*.src.rpm | while read srpm; do
 							if mock -r ${l_DIST}-${l_CODENAME}-x86_64 --result $PKGDIST/$l_DIST/$l_CODENAME/x86_64 $srpm; then
-								rpmsign-unattended -D "%_gpg_name debian at x2go.org" --addsign $PKGDIST/$l_DIST/$l_CODENAME/x86_64/*.rpm
+								if [ "$l_DIST" = "epel" ] && [ "$l_CODENAME" = "5" ]; then
+									RPMMACRO_V3SIGN='-D "%__gpg_sign_cmd %{__gpg} 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}\""'
+								fi
+								rpmsign-unattended -D "%_gpg_name debian at x2go.org" $RPMMACRO_V3SIGN --addsign $PKGDIST/$l_DIST/$l_CODENAME/x86_64/*.rpm
 								cat $PKGDIST/$l_DIST/$l_CODENAME/x86_64/build.log
 							else
 								cat $PKGDIST/$l_DIST/$l_CODENAME/x86_64/build.log

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git