From: Bob Glossman <bob.glossman@intel.com>
Date: Mon, 11 Jul 2016 18:09:52 +0000 (-0700)
Subject: LU-8390 build: use correct .spec file for SLES 12
X-Git-Tag: v1.42.13.wc6~5
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=cbbd8d6d6d5017355afc9cba4a25fe2aeb0dd494;p=tools%2Fe2fsprogs.git

LU-8390 build: use correct .spec file for SLES 12

Changes in output from the lsb_release command in SLES 12
resulted in using the wrong .spec file in builds.
This patch corrects the problem for old and new versions.

Signed-off-by: Bob Glossman <bob.glossman@intel.com>
Change-Id: I41d47c305eba7d3dd0d313be5ad8192592291fad
Reviewed-on: http://review.whamcloud.com/21237
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
---

diff --git a/contrib/build-rpm b/contrib/build-rpm
index a04d006..a8f4d20 100644
--- a/contrib/build-rpm
+++ b/contrib/build-rpm
@@ -75,7 +75,7 @@ case "$DISTRO-$RELEASE" in
     Fedora-1[5-9]) DISTRO=RHEL; RELEASE=7;;
     Fedora-2[0-9]) DISTRO=RHEL; RELEASE=7;;
     SUSE\ LINUX-11*) DISTRO=SUSE_LINUX; RELEASE=11;;
-    SUSE\ LINUX-12*) DISTRO=SUSE_LINUX; RELEASE=12;;
+    SUSE\ LINUX-12* | SUSE-12*) DISTRO=SUSE_LINUX; RELEASE=12;;
 esac
 
 SPECFILE="$currdir/e2fsprogs-${DISTRO// /_}-$RELEASE.spec"