- new map

[packages/rpm-build-tools.git] / builder.sh

diff --git a/builder.sh b/builder.sh
index 26e19a3a4453bbb512c4ab9ebf041ba15f28a763..b69aacfb92e27d5b42086a4412e7380bfb184e4e 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -738,6 +738,15 @@ get_spec() {
                        rm "$ASSUMED_NAME/CVS/Entries.Static"
                        cvsignore_df .cvsignore
 
+                       # add default log format to .cvsignore if it is relative
+                       if [ "$LOGFILE" == $(basename "$LOGFILE") ]; then
+                               # substitute known "macros" to glob
+                               local logfile=$(echo "$LOGFILE" | sed -e 's,\$\(PACKAGE_NAME\|DATE\),*,g')
+                               if [ "$logfile" ]; then
+                                       cvsignore_df "$logfile"
+                               fi
+                       fi
+
                        # create symlinks for tools
                        if [ "$SYMLINK_TOOLS" != "no" ]; then
                                for a in dropin md5 adapter builder {relup,compile,repackage,rsync,pearize}.sh pldnotify.awk; do
@@ -2301,7 +2310,7 @@ while [ $# -gt 0 ]; do
                        Exit_error err_invalid_cmdline "$1"
                        ;;
                *)
-                       SPECFILE=$1; shift
+                       SPECFILE=${1%/}; shift
                        # check if specname was passed as specname:cvstag
                        if [ "${SPECFILE##*:}" != "${SPECFILE}" ]; then
                                CVSTAG="${SPECFILE##*:}"