[X2Go-Commits] [buildscripts] 01/01: bin/build-rpm-package: fixup clear_pkgdist for *SUSE.

[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 37089296b4ba08c96f2bead2339d1f5c4ed57744
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Nov 25 04:16:13 2016 +0100

    bin/build-rpm-package: fixup clear_pkgdist for *SUSE.
---
 bin/build-rpm-package |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 71d8857..b7493d4 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -626,6 +626,13 @@ clear_pkgdist() {
 
 				# Yes, "SRPM" is technically not an architecture.
 				for l_ARCH in x86_64 i386 SRPM; do
+					# Rename the i386 arch to i586 for OpenSuSE and SLE{S,D}.
+					if [ "${l_DIST}" = "opensuse" ] || [ "${l_DIST}" = "sle" ]; then
+						if [ "${l_ARCH}" = "i386" ]; then
+							l_ARCH="i586"
+						fi
+					fi
+
 					if [ "x${SKIP_ARCH}" != "x${l_ARCH}" ]; then
 						mkdir -p -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}"
 						rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/rpmbuild/SOURCES/"*

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