[X2Go-Commits] [buildscripts] 01/01: Fix: wqfix v3signing for epel-5 builds (Fixes: #699)

git-admin at x2go.org git-admin at x2go.org
Mon Dec 22 01:40:52 CET 2014


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

x2go pushed a commit to branch master
in repository buildscripts.

commit 1c1553aa265e0005b20416674280e43ab63a3795
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Sun Dec 21 19:36:54 2014 -0500

    Fix: wqfix v3signing for epel-5 builds (Fixes: #699)
---
 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 b3f047b..164e06e 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -285,7 +285,10 @@ build_packages() {
 						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
 								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}"
+									# References:
+									# /usr/lib/rpm/macros
+									# http://adminotes.blogspot.fr/2011/12/centos-6-rpm-sign-problem-v4-signatures.html
+									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 debian at x2go.org" -D "$RPMMACRO_V3SIGN" --addsign $PKGDIST/$l_DIST/$l_CODENAME/x86_64/*.rpm
 								else
 									rpmsign-unattended -D "%_gpg_name debian at x2go.org" --addsign $PKGDIST/$l_DIST/$l_CODENAME/x86_64/*.rpm

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


More information about the x2go-commits mailing list