patch from Andrew Bird to correct a few file/directory checks when building

diff --git a/packaging/RedHat/makerpms.sh.tmpl b/packaging/RedHat/makerpms.sh.tmpl
index 31e660d945017a56d4f1021b786896f5118375dc..287b5dc94376a5255fe967fca6628bb597d755a3 100644 (file)
--- a/packaging/RedHat/makerpms.sh.tmpl
+++ b/packaging/RedHat/makerpms.sh.tmpl
@@ -12,9 +12,9 @@
 # Note: Under this directory rpm expects to find the same directories that are under the
 #   /usr/src/redhat directory
 #
-if [ -x ~/.rpmmacros ]; then
+if [ -f ~/.rpmmacros ]; then
        TOPDIR=`awk '/topdir/ {print $2}' < ~/.rpmmacros`
-       if [ z$TOPDIR <> "z" ]; then
+       if [ z$TOPDIR != "z" ]; then
                SPECDIR=${TOPDIR}/SPECS
                SRCDIR=${TOPDIR}/SOURCES
        fi