From 0d14436afbb2a18766926b37353b4b3b4e0d006b Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Fri, 7 Sep 2018 10:06:58 +0000
Subject: [PATCH] create-mkspec.sh: Create-mkspec.sh remove %exclude
 opt/$NAME/make/*.mk from spec

Not exactly sure why this was needed in the first place. It apparently
was introduced on 2013-03-18, and already then denoted as a kludge.

Also some more code beautification

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 scripts/create-mkspec.sh | 51 +++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/scripts/create-mkspec.sh b/scripts/create-mkspec.sh
index f9f1e7ad..81e222c1 100644
--- a/scripts/create-mkspec.sh
+++ b/scripts/create-mkspec.sh
@@ -22,7 +22,7 @@ _cat()
 
 subpackages()
 {
-	echo $SUBPACKAGES
+	echo $subpackages
 }
 
 # -- here we go
@@ -34,16 +34,16 @@ dir=`dirname $0`
 inifile="$1"
 . $dir/ini-tools.sh
 
-LICENSE=`cfg_value global.license`
-[ "$LICENSE" ] || LICENSE="janware GmbH proprietary license"
-SUBPACKAGES=`cfg_value global.subpackages`
+subpackages=`cfg_value global.subpackages`
+license=`cfg_value global.license`
+[ "$license" ] || license="janware GmbH proprietary license"
 
-_cat << EOT
+_cat <<- EOT
 	|echo "Name: \$NAME"
 	|echo "Summary: `cfg_value summary`"
 	|echo "Version: \$VERSION"
 	|echo "Release: \$RELEASE"
-	|echo "License: $LICENSE"
+	|echo "License: $license"
 	|echo "Group: System/Libraries"
 	|[ -n "\$SOURCE" ] && echo "Source: \$SOURCE"
 	|echo "Vendor: janware GmbH"
@@ -55,7 +55,8 @@ _cat << EOT
 	|echo "`cfg_value description`"
 	|echo ""
 EOT
-subpackages | grep -q run && _cat << EOT
+
+subpackages | grep -q run && _cat <<- EOT
 	|# ---------------------------------------
 	|echo "%package -n \$NAME-run"
 	|echo "Summary: `cfg_value summary`"
@@ -66,7 +67,8 @@ subpackages | grep -q run && _cat << EOT
 	|echo "Runtime package"
 	|echo ""
 EOT
-subpackages | grep -q devel && _cat << EOT
+
+subpackages | grep -q devel && _cat <<- EOT
 	|# ---------------------------------------
 	|echo "%package -n \$NAME-devel"
 	|echo "Summary: `cfg_value summary`, development package"
@@ -77,13 +79,14 @@ subpackages | grep -q devel && _cat << EOT
 	|echo "Development package"
 	|echo ""
 EOT
-subpackages | grep -q run && _cat << EOT
+
+subpackages | grep -q run && _cat <<- EOT
 	|# ---------------------------------------
 	|echo "%prep -n \$NAME-run"
 	|echo ""
 EOT
 
-_cat << EOT
+_cat <<- EOT
 	|echo "%setup -q -n \$NAME-\$V"
 	|echo ""
 	|echo "%build"
@@ -99,12 +102,13 @@ _cat << EOT
 	|echo "> \$INSTALL_LOG"
 	|echo "make install"
 	|echo "export PATH=$MOD_SCRIPT_DIR:\\\$PATH"
-	|echo "/bin/bash pkg.sh milk-install-log -p \\\$ENV_PREFIX -n \$NAME -t rpm -s \\"$SUBPACKAGES\\" \$INSTALL_LOG \`dirname \$INSTALL_LOG\`"
+	|echo "/bin/bash pkg.sh milk-install-log -p \\\$ENV_PREFIX -n \$NAME -t rpm -s \\"$subpackages\\" \$INSTALL_LOG \`dirname \$INSTALL_LOG\`"
 	|echo ""
 EOT
 
 # -- scripts
-for p in $SUBPACKAGES; do
+
+for p in $subpackages; do
 	for stage in pre preun post postun; do
 		echo "================= processing stage $stage: cfg_section pkg.$p.$stage" >&2
 		cfg_section pkg.$p.$stage >&2
@@ -118,23 +122,28 @@ for p in $SUBPACKAGES; do
 		}
 	done
 done
-_cat << EOT
+
+_cat <<- EOT
 	|echo ""
 	|echo "%clean"
 	|#echo 'rm -rf \$RPM_BUILD_ROOT'
 EOT
-subpackages | grep -q run && _cat << EOT
+
+subpackages | grep -q run && _cat <<- EOT
 	|echo "%files -n \$NAME-run -f \$INSTALL_LOG.\$NAME-run"
 EOT
-if subpackages | grep -q devel; then _cat << EOT
+
+if subpackages | grep -q devel; then _cat <<- EOT
 	|echo "%files -n \$NAME-devel -f \$INSTALL_LOG.\$NAME-devel"
-EOT
-cfg_section pkg.devel.post
+	EOT
+	cfg_section pkg.devel.post
 else
-	_cat << EOT
-	|echo "%exclude /opt/\$NAME/make/*.mk"
-EOT
+	_cat <<- EOT
+	|# don't remember why this was needed
+	|#echo "%exclude /opt/\$NAME/make/*.mk"
+	EOT
 fi
-		_cat << EOT
+
+_cat <<- EOT
 	|echo '%defattr (-, root, root)'
 EOT