[X2Go-Commits] [buildscripts] 01/01: wqfix v3signing 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 3c79b61da0e25e7df61206d0d6ac986e457ff7af
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 13 03:14:00 2014 +0100

    wqfix v3signing for epel-5 builds
---
 bin/build-rpm-package |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index df9624c..3326dc5 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -285,9 +285,11 @@ 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='-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}\""'
+									RPMMACRO_V3SIGN="%__gpg_sign_cmd %{__gnupg} --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
 								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
@@ -332,7 +334,12 @@ build_packages() {
 						rm -f $PKGDIST/$l_DIST/$l_CODENAME/i386/build.log
 						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 nice mock -r ${l_DIST}-${l_CODENAME}-i386  --result $PKGDIST/$l_DIST/$l_CODENAME/i386 "$srpm"; then
-								rpmsign-unattended -D "%_gpg_name debian at x2go.org" --addsign $PKGDIST/$l_DIST/$l_CODENAME/i386/*.rpm
+								if [ "$l_DIST" = "epel" ] && [ "$l_CODENAME" = "5" ]; then
+									RPMMACRO_V3SIGN="%__gpg_sign_cmd %{__gnupg} --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/i386/*.rpm
+								else
+									rpmsign-unattended -D "%_gpg_name debian at x2go.org" --addsign $PKGDIST/$l_DIST/$l_CODENAME/i386/*.rpm
+								fi
 								cat $PKGDIST/$l_DIST/$l_CODENAME/i386/build.log
 							else
 								cat $PKGDIST/$l_DIST/$l_CODENAME/i386/build.log

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