rpmbuildlocal: +Workaround recent rpm bug of stale ./BUILDROOT

diffc: +-p
diffi: +|diffdecvs

diff --git a/.bashrc b/.bashrc
index 8e1ca75..daf69ee 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -150,8 +150,9 @@ eval '
        function cal {(unset cal; ( cal -m "$@"; ); );}
        function vncreadonly { vncviewer -FullColor -Shared -ViewOnly "$@"; }
        function diff {(unset diff; ( diff -up "$@"; ); );}
-       function rpmbuildlocal { nice rpmbuild --define "_topdir $PWD" --define "_builddir $PWD" --define "_rpmdir $PWD" --define "_sourcedir $PWD" --define "_specdir $PWD" --define "_srcrpmdir $PWD" --define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" "$@"; }
+       function rpmbuildlocal { nice rpmbuild --define "_topdir $PWD" --define "_builddir $PWD" --define "_rpmdir $PWD" --define "_sourcedir $PWD" --define "_specdir $PWD" --define "_srcrpmdir $PWD" --define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" "$@"; rmdir &>/dev/null BUILDROOT; }
        function gdbn { gdb -nx --command=~/.gdbinit "$@"; }
+       function hd { od -Ax -tx1; }
 '
 
 export IGNOREEOF=10
@@ -256,8 +257,8 @@ function debuginfo { if test -n "$*";then echo "$*";else cat;fi \
        |xargs rpm -qf|xargs rpmquery --qf '%{SOURCERPM}\n'|sed 's/-[^-]*-[^-]*[.]src[.]rpm$/-debuginfo/'|sort -u; }
 function ipcsrmall { ipcs|awk '/- Shared Memory/{x="-m"}/- Semaphore/{x="-s"}/^0x/{print "ipcrm "x" "$2}'; }
 function eog {(unset eog; touch /tmp/eog.$$;eog "$@" {,,,,,,,,,}/tmp/eog.$$;rm -f /tmp/eog.$$; );}
-function diffc { diff -u "$@"|grep -v '^\(Only in \|Binary files\)'; }
-function diffi { diffc -X ~/.diffi.list "$@"; }
+function diffc { diff -up "$@"|grep -v '^\(Only in \|Binary files\)'; }
+function diffi { diffc -X ~/.diffi.list "$@" | diffdecvs; }
 function cvs {(unset cvs
        local _opts _opts_d _now _line _o
        _opts_d="-d"