diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2014-12-21 19:36:54 -0500 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2014-12-21 19:36:54 -0500 |
| commit | 1c1553aa265e0005b20416674280e43ab63a3795 (patch) | |
| tree | 9715bff80e7a636af70d3fd30a2f38e9f1519043 | |
| parent | e072cdc878a3ece63530eae64c9e0279ed722171 (diff) | |
| download | buildscripts-1c1553aa265e0005b20416674280e43ab63a3795.tar.gz buildscripts-1c1553aa265e0005b20416674280e43ab63a3795.tar.bz2 buildscripts-1c1553aa265e0005b20416674280e43ab63a3795.zip | |
Fix: wqfix v3signing for epel-5 builds (Fixes: #699)
| -rwxr-xr-x | bin/build-rpm-package | 5 |
1 files changed, 4 insertions, 1 deletions
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@x2go.org" -D "$RPMMACRO_V3SIGN" --addsign $PKGDIST/$l_DIST/$l_CODENAME/x86_64/*.rpm else rpmsign-unattended -D "%_gpg_name debian@x2go.org" --addsign $PKGDIST/$l_DIST/$l_CODENAME/x86_64/*.rpm |