From 936b4570a33a878b3fbcba5b92da52159c71ddc1 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Sun, 31 Dec 2017 23:59:59 +0000
Subject: [PATCH] Remove trailing spaces in file makerpm

---
 makerpm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/makerpm b/makerpm
index 8ed19bf24..c65a02da3 100755
--- a/makerpm
+++ b/makerpm
@@ -23,7 +23,7 @@ function xcat_probe_copy {
    fi
 }
 
-function xcat_probe_cleanup { 
+function xcat_probe_cleanup {
    RPMNAME=${1}
    if [ $RPMNAME = "xCAT-probe" ]; then
        rm -rf ${RPMNAME}/lib/perl/xCAT/
@@ -44,22 +44,22 @@ function makenoarch {
 	else	# linux
 		echo "Building $RPMROOT/RPMS/noarch/$RPMNAME-$VER-snap*.noarch.rpm $EMBEDTXT..."
 		# TODO: should fix this up, this is a hack for the new build machine
-		if [ $RPMNAME = "xCAT-UI" ]; then 
+		if [ $RPMNAME = "xCAT-UI" ]; then
 			# Only if the old compiler.jar file does not exist.....
-			if [ ! -e /xcat2/build/tools/compiler.jar ]; then 
+			if [ ! -e /xcat2/build/tools/compiler.jar ]; then
 				# look for the dynamic location of the compiler.jar file
 				DIRNAME=`dirname $(readlink -f $0)`
 				COMPILER_JAR=`echo "${DIRNAME%%linux_rpm/*}tools/compiler.jar"`
-				if [ -f $COMPILER_JAR ]; then 
+				if [ -f $COMPILER_JAR ]; then
 					sed -i "s#/xcat2/build/tools/compiler.jar#${COMPILER_JAR}#g" xCAT-UI/xCAT-UI.spec
-				else 
+				else
 					# In c910, if using the old buildxcat scripts...
 					COMPILER_JAR=`echo "${DIRNAME%%old/*}xcat2/tools/compiler.jar"`
-					if [ -f $COMPILER_JAR ]; then 
+					if [ -f $COMPILER_JAR ]; then
 						sed -i "s#/xcat2/build/tools/compiler.jar#${COMPILER_JAR}#g" xCAT-UI/xCAT-UI.spec
 					fi
 				fi
-			fi 
+			fi
 		fi
 
                 xcat_probe_copy ${RPMNAME}
@@ -145,7 +145,7 @@ function makexcat {
 			cp xcat.conf.apach24 $RPMROOT/SOURCES
 			cp xCATSN $RPMROOT/SOURCES
                         cp -a ../xCAT/etc/rsyslog.d $RPMROOT/
-                        cp -a ../xCAT/etc/logrotate.d $RPMROOT/ 
+                        cp -a ../xCAT/etc/logrotate.d $RPMROOT/
 			cd - >/dev/null
 		elif [ "$RPMNAME" = "xCAT-buildkit" ]; then
 			ARCH="noarch"
@@ -175,7 +175,7 @@ function makexcat {
 function makeironic {
 	RPMNAME="$1"
 	ARCH="$2"
-	cd `dirname $0`/$RPMNAME    
+	cd `dirname $0`/$RPMNAME
 	cp -rf ironic_baremetal /tmp/
 	cd /tmp/ironic_baremetal
 	git init
@@ -286,7 +286,7 @@ elif [ "$1" = "xCAT-genesis-scripts" ]; then
 	exportEmbed $3
 	makegenesisscripts $1 $2
 elif [ "$1" = "xCAT-OpenStack-ironic" ]; then
-	makeironic $1 $2    
+	makeironic $1 $2
 else	# must be one of the noarch rpms
 	exportEmbed $2
 	makenoarch $1