- HOME_ETC support for glen's idea of .bcondrc

Changed files:
    builder.sh -> 1.297

diff --git a/builder.sh b/builder.sh
index 01b51bccfa0d779f96c4b6ac7dbaa372aa5d9b1d..6af77f2adbf3f5bfe0616466e85f9cb2f4ad7bde 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -953,12 +953,15 @@ set_bconds_values()
        # w32codec license_agreement
        # php +mysqli
        # ---
-       if [ "${BCOND_VERSION}" != "NONE" ] && [ -f $HOME/.bcondrc ]; then
+       if [ "${BCOND_VERSION}" != "NONE" ] && ( [ -f $HOME/.bcondrc ] || ( [ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ] ) ) ; then
                # This takes package name, first defined in spec.
                # so consider that when defining flags for package.
                PN=`$RPM -q --qf '%{NAME}\n' --specfile $SPECFILE | head -n 1`
                AVAIL=`$RPMBUILD --bcond $SPECFILE`
 
+               BCONDRC=$HOME/.bcondrc
+               [ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ] && BCONDRC=$HOME_ETC/.bcondrc
+
                while read pkg flags; do
                        # ignore comments
                        [[ "$pkg" == \#* ]] && continue
@@ -978,7 +981,7 @@ set_bconds_values()
                                        fi
                                done
                        fi
-               done < $HOME/.bcondrc
+               done < $BCONDRC
        fi
 
        case "${BCOND_VERSION}" in