This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 42c26e2b2fb7be0111dbe95ac7cd4ec877ca118c
Author: Mihai Moldovan <[email protected]>
Date:   Thu Feb 23 14:43:14 2023 +0100

    bin/build-rpm-package: fix SLE 11 dist parameter, essentially hardcoding it 
to SLES 11 SP2.
---
 bin/build-rpm-package | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index fc7b682..0a0edd4 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -734,7 +734,15 @@ generate_suse_dist_value () {
 
                ret="${ret}"'tumbleweed'
        else
-               ret="${ret}${major_version}.${minor_version}"
+               if [ 'sle' = "${distname}" ] && [ '11' = "${major_version}" ]; 
then
+                       # There's only a config file for sles11 and one for 
sles11sp2. Back in the
+                       # SLE 11 days, Service Packs could not be 
differentiated at all (in spec
+                       # files, at least), and since we've only ever used 11.2 
and 11.3, it's fine
+                       # to hardcode SLES 11 SP2 here.
+                       ret='s'"${major_version}"'sp2'
+               else
+                       ret="${ret}${major_version}.${minor_version}"
+               fi
        fi
 
        printf '%s\n' "${ret}"

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/buildscripts.git
_______________________________________________
x2go-commits mailing list
[email protected]
https://lists.x2go.org/listinfo/x2go-commits

Reply via email to