SOURCES: rpm-build.sh - don't discriminate th devils
glen
glen at pld-linux.org
Sat Dec 9 16:18:35 CET 2006
Author: glen Date: Sat Dec 9 15:18:35 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- don't discriminate th devils
---- Files affected:
SOURCES:
rpm-build.sh (1.11 -> 1.12)
---- Diffs:
================================================================
Index: SOURCES/rpm-build.sh
diff -u SOURCES/rpm-build.sh:1.11 SOURCES/rpm-build.sh:1.12
--- SOURCES/rpm-build.sh:1.11 Sat Dec 9 16:15:05 2006
+++ SOURCES/rpm-build.sh Sat Dec 9 16:18:30 2006
@@ -10,6 +10,9 @@
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'"
+# set $distro, used by functions below
+[ -n "$distro" ] || distro=$(awk '{print tolower($NF)}' /etc/pld-release 2>/dev/null | tr -d '()')
+
# merges two patches
# requires: patchutils
pmerge() {
@@ -63,7 +66,7 @@
local out
for a in "$@"; do
s=${a%.spec}.spec
- out=$(cvs status -v $s | awk '/auto-ac-/{if (!a++) print $1}')
+ out=$(cvs status -v $s | awk "/auto-$distro-/{if (!a++) print \$1}")
echo "$s:$out"
done
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rpm-build.sh?r1=1.11&r2=1.12&f=u
More information about the pld-cvs-commit
mailing list