SOURCES: rpm-build.sh - updated

[glen]

Author: glen                         Date: Tue Oct 31 20:28:02 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   rpm-build.sh (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/rpm-build.sh
diff -u SOURCES/rpm-build.sh:1.4 SOURCES/rpm-build.sh:1.5
--- SOURCES/rpm-build.sh:1.4	Mon Oct 16 12:39:10 2006
+++ SOURCES/rpm-build.sh	Tue Oct 31 21:27:57 2006
@@ -7,7 +7,7 @@
 alias ac-provides='ac what-provides'
 alias ac-verify='poldek --sn ac --sn ac-ready -V'
 alias ac-tag='./builder -cf -T AC-branch -r HEAD'
-alias adif="dif -x '*.m4' -x ltmain.sh -x install-sh -x depcomp -x 'Makefile.in' -x compile -x 'config.*' -x configure -x missing -x mkinstalldirs"
+alias adif="dif -x '*.m4' -x ltmain.sh -x install-sh -x depcomp -x 'Makefile.in' -x compile -x 'config.*' -x configure -x missing -x mkinstalldirs -x autom4te.cache"
 alias pclean="sed -i~ -e '/^\(?\|=\+$\|unchanged:\|diff\|only\|Only\|Files\|Common\|Index:\|RCS file\|retrieving\)/d'"
 
 # merges two patches
@@ -38,7 +38,11 @@
 	file=${file%\?*}
 
 	echo >&2 "$file: $r1 -> $r2"
-	cvs diff -u -r$r1 -r$r2 $file | tee m.patch | diffcol
+
+	if [ -t 1 ]; then
+		pipe=' | tee m.patch | diffcol'
+	fi
+	cvs diff -u -r$r1 -r$r2 $file $pipe
 }
 
 # downloads sourceforge url from specific mirror
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm-build.sh?r1=1.4&r2=1.5&f=u