diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-12-13 03:14:00 +0100 |
|---|---|---|
| committer | X2Go Admin Account <x2go-admin@static.194.20.243.136.clients.your-server.de> | 2014-12-13 03:14:15 +0100 |
| commit | 3c79b61da0e25e7df61206d0d6ac986e457ff7af (patch) | |
| tree | 57f9f8573e88d944efc56c3ef686faa07aff39d5 | |
| parent | d30bd4322f0f63ef36bf48fac129bb53207ec622 (diff) | |
| download | buildscripts-3c79b61da0e25e7df61206d0d6ac986e457ff7af.tar.gz buildscripts-3c79b61da0e25e7df61206d0d6ac986e457ff7af.tar.bz2 buildscripts-3c79b61da0e25e7df61206d0d6ac986e457ff7af.zip | |
wqfix v3signing for epel-5 builds
| -rwxr-xr-x | bin/build-rpm-package | 13 |
1 files 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@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 fi - rpmsign-unattended -D "%_gpg_name debian@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@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@x2go.org" -D "$RPMMACRO_V3SIGN" --addsign $PKGDIST/$l_DIST/$l_CODENAME/i386/*.rpm + else + rpmsign-unattended -D "%_gpg_name debian@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 |