[X2Go-Commits] [buildscripts] 01/01: rename sles to sle

[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 e7a52e9baaac7291440ce44bfb5f4a77b75d450c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 20 05:45:26 2014 +0100

    rename sles to sle
---
 bin/build-rpm-package        |   20 ++++++++++----------
 home/.buildscripts/x2go.conf |    4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 1207b50..2da7601 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -25,11 +25,11 @@ GIT_HOSTNAME="git.mydomain.org"
 RPMEMAIL="firstname.lastname at mydomain.org"
 RPMFULLNAME="Firstname Lastname"
 GPG_KEY=
-RPM_DISTS_SUPPORTED="fedora epel opensuse sles"
+RPM_DISTS_SUPPORTED="fedora epel opensuse sle"
 FEDORA_DISTROS="18,19,20,21,rawhide"
 EPEL_DISTROS="6,7"
 OPENSUSE_DISTROS="12.2,12.3,13.1,13.2"
-SLES_DISTROS="11.2,11.3,12.0"
+SLE_DISTROS="11.2,11.3,12.0"
 RPM_REPOS_BASE=/var/www/
 
 COMPONENT_MAIN="main"
@@ -40,7 +40,7 @@ PACKAGES_WITHOUT_OTHERMIRROR="keyring"
 GNUPGHOME=$HOME/.gnupg
 
 OPENSUSE_DOWNLOAD_URL="http://download.opensuse.org/distribution/#VERSION#/repo/oss/suse/"
-SLES_DOWNLOAD_URL="/srv/mirrors/non-public/sles/#VERSION#/repo/oss/suse/"
+SLE_DOWNLOAD_URL="/srv/mirrors/non-public/sle/#VERSION#/repo/oss/suse/"
 
 test -z $1 && { echo "usage: $(basename $0) [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit -1; }
 
@@ -49,7 +49,7 @@ test -f ~/.buildscripts/$PREFIX.conf && . ~/.buildscripts/$PREFIX.conf || { echo
 
 NO_DELAY=${NO_DELAY:-"no"}
 FORCE_BUILD=${FORCE_BUILD:-"no"}
-RPM_BUILD_FOR=${RPM_BUILD_FOR:-"fedora:$FEDORA_DISTROS epel:$EPEL_DISTROSi opensuse:$OPENSUSE_DISTROS" sles:$SLES_DISTROS}
+RPM_BUILD_FOR=${RPM_BUILD_FOR:-"fedora:$FEDORA_DISTROS epel:$EPEL_DISTROSi opensuse:$OPENSUSE_DISTROS" sle:$SLE_DISTROS}
 
 set -ex
 
@@ -250,11 +250,11 @@ build_packages() {
 				#fi
 
 				if [ "x$SKIP_ARCH" != "xx86_64" ] || [ "$IS_NOARCH" = "yes" ]; then
-					if [ "x$l_DIST" = "xopensuse" ] || [ "x$l_DIST" = "xsles" ]; then
+					if [ "x$l_DIST" = "xopensuse" ] || [ "x$l_DIST" = "xsle" ]; then
 						if [ "x$l_DIST" = "xopensuse" ]; then
 							DOWNLOAD_URL=$(echo "$OPENSUSE_DOWNLOAD_URL" | sed "s/#VERSION#/$l_CODENAME/")
-						elif [ "x$l_DIST" = "xsles" ]; then
-							DOWNLOAD_URL=$(echo "$SLES_DOWNLOAD_URL" | sed "s/#VERSION#/$l_CODENAME/")
+						elif [ "x$l_DIST" = "xsle" ]; then
+							DOWNLOAD_URL=$(echo "$SLE_DOWNLOAD_URL" | sed "s/#VERSION#/$l_CODENAME/")
 						fi
 						while ps ax | grep -E "build.*/var/cache/obs-build/$l_DIST/$l_CODENAME/x86_64/" | grep "sudo obs"; do
 							echo "Waiting for some other build to finish..."
@@ -300,11 +300,11 @@ build_packages() {
 					fi
 				fi
 				if [ "x$SKIP_ARCH" != "xi386" ] && [ "$IS_NOARCH" != "yes" ]; then
-					if [ "x$l_DIST" = "xopensuse" ] || [ "x$l_DIST" = "xsles" ]; then
+					if [ "x$l_DIST" = "xopensuse" ] || [ "x$l_DIST" = "xsle" ]; then
 						if [ "x$l_DIST" = "xopensuse" ]; then
 							DOWNLOAD_URL=$(echo "$OPENSUSE_DOWNLOAD_URL" | sed "s/#VERSION#/$l_CODENAME/")
-						elif [ "x$l_DIST" = "xsles" ]; then
-							DOWNLOAD_URL=$(echo "$SLES_DOWNLOAD_URL" | sed "s/#VERSION#/$l_CODENAME/")
+						elif [ "x$l_DIST" = "xsle" ]; then
+							DOWNLOAD_URL=$(echo "$SLE_DOWNLOAD_URL" | sed "s/#VERSION#/$l_CODENAME/")
 						fi
 						while ps ax | grep -E "build.*/var/cache/obs-build/$l_DIST/$l_CODENAME/i386/" | grep "sudo obs"; do
 							echo "Waiting for some other build to finish..."
diff --git a/home/.buildscripts/x2go.conf b/home/.buildscripts/x2go.conf
index 4823456..60e216a 100644
--- a/home/.buildscripts/x2go.conf
+++ b/home/.buildscripts/x2go.conf
@@ -13,8 +13,8 @@ DEB_BUILD_FOR=${DEB_BUILD_FOR:-"debian:squeeze,wheezy,jessie,sid"}
 RPMEMAIL=git-admin at x2go.org
 RPMFULLNAME="X2Go Git Administrator"
 GPG_KEY="F4A7678C9C6B0B2B"
-RPM_DISTS_SUPPORTED="fedora epel opensuse sles"
-RPM_BUILD_FOR=${RPM_BUILD_FOR:-"fedora:18,19,20,21,rawhide epel:6 sles:11 opensuse:12.2,12.3,13.1,13.2 sles:11.2,11.3,12.0"}
+RPM_DISTS_SUPPORTED="fedora epel opensuse sle"
+RPM_BUILD_FOR=${RPM_BUILD_FOR:-"fedora:18,19,20,21,rawhide epel:6 opensuse:12.2,12.3,13.1,13.2 sle:11.2,11.3,12.0"}
 RPM_REPOS_BASE=/srv/sites/x2go.org/packages/
 
 COMPONENT_MAIN="main"

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