[X2Go-Commits] [buildscripts] 01/01: bin/build-rpm-package: fix OpenSuSE download URLs.

[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 7952cb15301aee6c30cbd16cf322ec8a5b21f8fd
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Apr 30 23:09:49 2018 +0200

    bin/build-rpm-package: fix OpenSuSE download URLs.
    
    Newer versions starting with Leap 15.0 omit the suse subdirectory.
---
 bin/build-rpm-package | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 17c987e..25067be 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -44,9 +44,9 @@ REPOS_SERVER="packages.mydomain.org"
 PACKAGES_WITHOUT_OTHERMIRROR="keyring"
 GNUPGHOME="${HOME}/.gnupg"
 
-OPENSUSE_DOWNLOAD_URL="https://download.opensuse.org/distribution/#LEAP##VERSION#/repo/oss/suse/"
-OPENSUSE_DOWNLOAD_TUMBLEWEED_URL="https://download.opensuse.org/tumbleweed/repo/oss/suse/"
-OPENSUSE_DOWNLOAD_ARCHIVE_URL="https://ftp.gwdg.de/pub/opensuse/discontinued/distribution/#LEAP##VERSION#/repo/oss/suse/"
+OPENSUSE_DOWNLOAD_URL="https://download.opensuse.org/distribution/#LEAP##VERSION#/repo/oss/#SUSESUBDIR#/"
+OPENSUSE_DOWNLOAD_TUMBLEWEED_URL="https://download.opensuse.org/tumbleweed/repo/oss/#SUSESUBDIR#/"
+OPENSUSE_DOWNLOAD_ARCHIVE_URL="https://ftp.gwdg.de/pub/opensuse/discontinued/distribution/#LEAP##VERSION#/repo/oss/#SUSESUBDIR#/"
 SLE_DOWNLOAD_URL="/srv/mirrors/non-public/sle/#VERSION#/rpms/"
 
 test -z "${1}" && {
@@ -1017,6 +1017,10 @@ build_packages() {
 
 						DOWNLOAD_URL="$(sed -e "s/#VERSION#/${l_CODENAME}/" <<< "${DOWNLOAD_URL}")"
 
+						if [[ "${tmp_suse_major_version}" -gt "14" ]]; then
+							DOWNLOAD_URL="$(sed -e 's/#SUSESUBDIR#/suse/' <<< "${DOWNLOAD_URL}")"
+						fi
+
 						if [[ "${tmp_suse_major_version}" != "9999" ]]; then
 							if [ "${tmp_suse_major_version}" -gt "13" ]; then
 								DOWNLOAD_URL="$(sed -e 's_#LEAP#_leap/_' <<< "${DOWNLOAD_URL}")"

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git