Fix the buildrpm script

rhc54 · rhc54 · commit df0280b1328e · 2022-08-21T05:00:31.000-06:00
Current code never finds home directory RPMBUILD, so
simplify it so it works.

Signed-off-by: Ralph Castain &lt;rhc@pmix.org&gt;
diff --git a/contrib/buildrpm.sh b/contrib/buildrpm.sh
@@ -94,7 +94,7 @@ echo "--> Found specfile: $specfile"
 # Find where the top RPM-building directory is
 #
 
-rpmtopdir=${rpmtopdir:-"`grep %_topdir $HOME/.rpmmacros | awk '{ print $2 }'`"}
+rpmtopdir=${rpmtopdir:-$HOME/RPMBUILD}
 if test "$rpmtopdir" != ""; then
 	rpmbuild_options="$rpmbuild_options --define '_topdir $rpmtopdir'"
     if test ! -d "$rpmtopdir"; then

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ echo "--> Found specfile: $specfile"`
`94`	`94`	`# Find where the top RPM-building directory is`
`95`	`95`	`#`
`96`	`96`
`97`		-rpmtopdir=${rpmtopdir:-"`grep %_topdir $HOME/.rpmmacros \| awk '{ print $2 }'`"}
	`97`	`+rpmtopdir=${rpmtopdir:-$HOME/RPMBUILD}`
`98`	`98`	`if test "$rpmtopdir" != ""; then`
`99`	`99`	`rpmbuild_options="$rpmbuild_options --define '_topdir $rpmtopdir'"`
`100`	`100`	`if test ! -d "$rpmtopdir"; then`