This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 50468a652971460e5f62b50b3d2e37958535fd1c Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Mar 22 03:55:43 2016 +0100 {bin/build-rpm-package,home/.buildscripts/x2go.conf}: add support for OpenSuSE Leap 42.1. --- bin/build-rpm-package | 19 +++++++++++++++++-- home/.buildscripts/x2go.conf | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 2f88a82..a2a5288 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -31,7 +31,7 @@ GPG_KEY="" RPM_DISTS_SUPPORTED="fedora epel opensuse sle" FEDORA_DISTROS="18,19,20,21,22,23,rawhide" EPEL_DISTROS="6,7" -OPENSUSE_DISTROS="12.2,12.3,13.1,13.2" +OPENSUSE_DISTROS="12.2,12.3,13.1,13.2,42.1" SLE_DISTROS="11.2,11.3,12.0" RPM_REPOS_BASE="/var/www/" RPM_WANT_EXTRA_REPOS="0" @@ -47,7 +47,7 @@ REPOS_SERVER="packages.mydomain.org" PACKAGES_WITHOUT_OTHERMIRROR="keyring" GNUPGHOME="${HOME}/.gnupg" -OPENSUSE_DOWNLOAD_URL="http://download.opensuse.org/distribution/#VERSION#/repo/oss/suse/" +OPENSUSE_DOWNLOAD_URL="http://download.opensuse.org/distribution/#LEAP##VERSION#/repo/oss/suse/" SLE_DOWNLOAD_URL="/srv/mirrors/non-public/sle/#VERSION#/rpms/" test -z "${1}" && { @@ -661,8 +661,23 @@ build_packages() { if [ "x${l_DIST}" = "xopensuse" ] || [ "x${l_DIST}" = "xsle" ]; then BUILD_RESULT="/home/abuild/rpmbuild/" + + typeset -i tmp_suse_major_version="0" + tmp_suse_major_version="$(sed -e 's/\([0-9]*\).*/\1/' <<< "${l_CODENAME}")" + + if [ "x${tmp_suse_major_version}" = "x0" ]; then + echo "Unable to extract SUSE version." + exit 1 + fi + if [ "x${l_DIST}" = "xopensuse" ]; then DOWNLOAD_URL="$(sed "s/#VERSION#/${l_CODENAME}/" <<< "${OPENSUSE_DOWNLOAD_URL}")" + + if [ "${tmp_suse_major_version}" -gt "13" ]; then + DOWNLOAD_URL="$(sed -e 's_#LEAP#_leap/_' <<< "${OPENSUSE_DOWNLOAD_URL}")" + else + DOWNLOAD_URL="$(sed -e 's_#LEAP#__' <<< "${OPENSUSE_DOWNLOAD_URL}")" + fi elif [ "x${l_DIST}" = "xsle" ]; then DOWNLOAD_URL="$(sed "s/#VERSION#/${l_CODENAME}/" <<< "${SLE_DOWNLOAD_URL}")" if [ "${l_CODENAME}" = "11.2" ] || [ "${l_CODENAME}" = "11.3" ]; then diff --git a/home/.buildscripts/x2go.conf b/home/.buildscripts/x2go.conf index 6a8bb65..b27bfb3 100644 --- a/home/.buildscripts/x2go.conf +++ b/home/.buildscripts/x2go.conf @@ -16,7 +16,7 @@ RPMEMAIL="git-admin@x2go.org" RPMFULLNAME="X2Go Git Administrator" GPG_KEY_EPEL5="00965D293CFD4372" RPM_DISTS_SUPPORTED="fedora epel opensuse sle" -: ${RPM_BUILD_FOR:="fedora:18,19,20,21,22,23,rawhide epel:6,7 opensuse:12.2,12.3,13.1,13.2 sle:11.2,11.3,12.0"} +: ${RPM_BUILD_FOR:="fedora:18,19,20,21,22,23,rawhide epel:6,7 opensuse:12.2,12.3,13.1,13.2,42.1 sle:11.2,11.3,12.0"} RPM_REPOS_BASE="/srv/sites/x2go.org/packages/" RPM_WANT_EXTRA_REPOS="1" RPM_MOCK_CONFIG_DIR="/etc/mock/" -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git