X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=builder.sh;h=b58d75e6dc4fca0cc23c12393e4bf571d7561482;hb=a93e8cdf8712f36f3f9ebcf47f6cd1cec01d2f30;hp=516eec1c617214a9f70d43c2a14a09c2b6849e34;hpb=cf264933850b87bceadd5ac9aacd7fe938cda8bb;p=packages%2Frpm-build-tools.git

diff --git a/builder.sh b/builder.sh
index 516eec1..b58d75e 100644
--- a/builder.sh
+++ b/builder.sh
@@ -1,6 +1,5 @@
-#!/bin/sh
+#!/bin/ksh
 # -----------
-# $Id$
 # Exit codes:
 #	  0 - succesful
 #	  1 - help displayed
@@ -20,9 +19,14 @@
 #	- when Icon: field is present, -5 and -a5 doesn't work
 #	- builder -R skips installing BR if spec is not present before builder invocation (need to run builder twice)
 
-VERSION="\
+RCSID='$Id$'
+r=${RCSID#* * }
+rev=${r%% *}
+VERSION="v0.18/$rev"
+VERSIONSTRING="\
 Build package utility from PLD Linux CVS repository
-v0.16 (C) 1999-2006 Free Penguins".
+$VERSION (C) 1999-2007 Free Penguins".
+
 PATH="/bin:/usr/bin:/usr/sbin:/sbin:/usr/X11R6/bin"
 
 COMMAND="build"
@@ -38,13 +42,16 @@ NOCVS=""
 NOCVSSPEC=""
 NODIST=""
 NOINIT=""
+PREFMIRRORS=""
 UPDATE=""
-UPDATE5=""
 ADD5=""
 NO5=""
 ALWAYS_CVSUP=${ALWAYS_CVSUP:-"yes"}
 CVSROOT=""
 
+# user agent when fetching files
+USER_AGENT="PLD/Builder($VERSION)"
+
 # It can be used i.e. in log file naming.
 # See LOGFILE example.
 DATE=`date +%Y-%m-%d_%H-%M-%S`
@@ -73,6 +80,7 @@ ICONS=""
 PACKAGE_RELEASE=""
 PACKAGE_VERSION=""
 PACKAGE_NAME=""
+ASSUMED_NAME=""
 PROTOCOL="ftp"
 WGET_RETRIES=${MAX_WGET_RETRIES:-0}
 CVS_RETRIES=${MAX_CVS_RETRIES:-1000}
@@ -93,6 +101,10 @@ FAIL_IF_NO_SOURCES="yes"
 # let get_files skip over files which are present to get those damn files fetched
 SKIP_EXISTING_FILES="no"
 
+TRY_UPGRADE=""
+# should the specfile be restored if upgrade failed?
+REVERT_BROKEN_UPGRADE="yes"
+
 if [ -x /usr/bin/rpm-getdeps ]; then
 	FETCH_BUILD_REQUIRES_RPMGETDEPS="yes"
 else
@@ -120,8 +132,10 @@ fi
 SU_SUDO=""
 if [ -n "$HOME_ETC" ]; then
 	USER_CFG="$HOME_ETC/.builderrc"
+	BUILDER_MACROS="$HOME_ETC/.builder-rpmmacros"
 else
 	USER_CFG=~/.builderrc
+	BUILDER_MACROS=~/.builder-rpmmacros
 fi
 
 [ -f "$USER_CFG" ] && . "$USER_CFG"
@@ -146,6 +160,7 @@ else
 	wget --help 2>&1 | grep -q -- ' --no-check-certificate ' && WGET_OPTS="$WGET_OPTS --no-check-certificate"
 	wget --help 2>&1 | grep -q -- ' --inet ' && WGET_OPTS="$WGET_OPTS --inet"
 	wget --help 2>&1 | grep -q -- ' --retry-connrefused ' && WGET_OPTS="$WGET_OPTS --retry-connrefused"
+	WGET_OPTS="$WGET_OPTS --user-agent=$USER_AGENT"
 
 	GETURI="wget --passive-ftp -c -nd -t$WGET_RETRIES $WGET_OPTS"
 	GETURI2="wget -c -nd -t$WGET_RETRIES $WGET_OPTS"
@@ -189,33 +204,36 @@ usage()
 {
 	if [ -n "$DEBUG" ]; then set -xv; fi
 	echo "\
-Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
-[-bb|--build-binary] [-bs|--build-source] [-u|--try-upgrade]
-[{-cf|--cvs-force}] [{-B|--branch} <branch>] [{-d|--cvsroot} <cvsroot>] 
-[-g|--get] [-h|--help] [--http] [{-l,--logtofile} <logfile>] [-m|--mr-proper]
-[-q|--quiet] [--date <yyyy-mm-dd> [-r <cvstag>] [{-T--tag <cvstag>]
+Usage: builder [-D|--debug] [-V|--version] [--short-version] [-a|--as_anon] [-b|-ba|--build]
+[-bb|--build-binary] [-bs|--build-source] [-bc] [-bi] [-bl] [-u|--try-upgrade]
+[{-cf|--cvs-force}] [{-B|--branch} <branch>] [{-d|--cvsroot} <cvsroot>]
+[-g|--get] [-h|--help] [--http] [{-l|--logtofile} <logfile>] [-m|--mr-proper]
+[-q|--quiet] [--date <yyyy-mm-dd> [-r <cvstag>] [{-T|--tag <cvstag>]
 [-Tvs|--tag-version-stable] [-Ts|--tag-stable] [-Tv|--tag-version]
 [{-Tp|--tag-prefix} <prefix>] [{-tt|--test-tag}]
-[-nu|--no-urls] [-v|--verbose] [--opts <rpm opts>] [--show-bconds]
-[--with/--without <feature>] [--define <macro> <value>] <package>[.spec][:cvstag]
+[-nu|--no-urls] [-v|--verbose] [--opts <rpm opts>] [--short-circuit]
+[--show-bconds] [--with/--without <feature>] [--define <macro> <value>]
+<package>[.spec][:cvstag]
 
 -5, --update-md5    - update md5 comments in spec, implies -nd -ncs
 -a5, --add-md5      - add md5 comments to URL sources, implies -nc -nd -ncs
 -n5, --no-md5       - ignore md5 comments in spec
 -D, --debug         - enable builder script debugging mode,
 -debug              - produce rpm debug package (same as --opts -debug)
--V, --version       - output builder version
+-V, --version       - output builder version string
+--short-version     - output builder short version
 -a, --as_anon       - get files via pserver as cvs@$CVS_SERVER,
 -b, -ba, --build    - get all files from CVS repo or HTTP/FTP and build package
                       from <package>.spec,
 -bb, --build-binary - get all files from CVS repo or HTTP/FTP and build binary
                       only package from <package>.spec,
 -bp, --build-prep   - execute the %prep phase of <package>.spec,
--bc                 - reserved (not implemented)
--bi                   reserved (not implemented)
+-bc                 - execute the %build phase of <package>.spec,
+-bi                 - execute the %install phase of <package>.spec
+-bl					- execute the %files phase of <package>.spec
 -bs, --build-source - get all files from CVS repo or HTTP/FTP and only pack
                       them into src.rpm,
---short-circuit     - reserved (not implemented)
+--short-circuit     - short-circuit build
 -B, --branch        - add branch
 -c, --clean         - clean all temporarily created files (in BUILD, SOURCES,
                       SPECS and \$RPM_BUILD_ROOT),
@@ -242,6 +260,7 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
 -ns, --no-srcs      - don't download Sources
 -ns0, --no-source0  - don't download Source0
 -nn, --no-net       - don't download anything from the net
+-pm, --prefer-mirrors - prefer mirrors (if any) over distfiles for SOURCES
 --no-init           - don't initialize builder paths (SPECS and SOURCES)
 -ske,
 --skip-existing-files - skip existing files in get_files
@@ -250,6 +269,7 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
 --date yyyy-mm-dd   - build package using resources from specified CVS date,
 -r <cvstag>, --cvstag <cvstag>
                     - build package using resources from specified CVS tag,
+-A                  - build package using CVS resources as any sticky tags/date/kopts being reset.
 -R, --fetch-build-requires
                     - fetch what is BuildRequired,
 -RB, --remove-build-requires
@@ -261,6 +281,7 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
 -sd, --source-distfiles - list sources available from distfiles (intended for offline
                       operations; does not work when Icon field is present
                       but icon file is absent),
+-sc, --source-cvs - list sources available from CVS
 -sdp, --source-distfiles-paths - list sources available from distfiles -
                       paths relative to distfiles directory (intended for offline
                       operations; does not work when Icon field is present
@@ -298,6 +319,9 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
                     - don't apply <patchnumber>
 --show-bconds       - show available conditional builds, which can be used
                     - with --with and/or --without switches.
+--show-bcond-args   - show active bconds, from ~/.bcondrc. this is used by
+                      ./repackage.sh script. in other words, the output is
+                      parseable by scripts.
 --with/--without <feature>
                     - conditional build package depending on %_with_<feature>/
                       %_without_<feature> macro switch.  You may now use
@@ -344,10 +368,11 @@ set_spec_target() {
 	if [ -n "$SPECFILE" ] && [ -z "$TARGET" ]; then
 		tmp=$(awk '/^BuildArch:/ { print $NF}' $SPECFILE)
 		if [ "$tmp" ]; then
+				target_platform=$(rpm -E '%{_target_vendor}-%{_target_os}%{?_gnu}')
 				TARGET="$tmp"
 				case "$RPMBUILD" in
 				"rpmbuild")
-					TARGET_SWITCH="--target $TARGET" ;;
+					TARGET_SWITCH="--target ${TARGET}-${target_platform}" ;;
 				"rpm")
 					TARGET_SWITCH="--target=$TARGET" ;;
 				esac
@@ -355,34 +380,28 @@ set_spec_target() {
 	fi
 }
 
-cache_rpm_dump () {
-	if [ -n "$DEBUG" ]; then
-		set -x;
-		set -v;
-	fi
-
-	update_shell_title "cache_rpm_dump"
-	local rpm_dump
-	rpm_dump=`
-
+# runs rpm with minimal macroset
+minirpm() {
 	# we reset macros not to contain macros.build as all the %() macros are
 	# executed here, while none of them are actually needed.
-	# what we need from dump is NAME, VERSION, RELEASE and PATCHES/SOURCES.
 	# at the time of this writing macros.build + macros contained 70 "%(...)" macros.
-	macrofiles="/usr/lib/rpm/macros:$SPECS_DIR/.builder-rpmmacros:~/etc/.rpmmacros:~/.rpmmacros"
-	dump='%{echo:dummy: PACKAGE_NAME %{name} }%dump'
-	# FIXME: better ideas than .rpmrc?
-	printf 'include:/usr/lib/rpm/rpmrc\nmacrofiles:%s\n' $macrofiles > .builder-rpmrc
-# TODO: move these to /usr/lib/rpm/macros
-	cat > .builder-rpmmacros <<'EOF'
+	safe_macrofiles=$(rpm --showrc | awk -F: '/^macrofiles/ { gsub(/^macrofiles[ \t]+:/, "", $0); gsub(/:.*macros.build:/, ":", $0); print $0 } ')
+
+	# TODO: move these to /usr/lib/rpm/macros
+	cat > $BUILDER_MACROS <<'EOF'
+%x8664 x86_64 amd64 ia32e
+%alt_kernel %{nil}
+%_alt_kernel %{nil}
 %requires_releq_kernel_up %{nil}
 %requires_releq_kernel_smp %{nil}
+%requires_releq_kernel %{nil}
 %requires_releq() %{nil}
 %pyrequires_eq() %{nil}
 %requires_eq() %{nil}
 %requires_eq_to() %{nil}
 %releq_kernel_up ERROR
 %releq_kernel_smp ERROR
+%releq_kernel ERROR
 %kgcc_package ERROR
 %_fontsdir ERROR
 %ruby_version ERROR
@@ -392,27 +411,56 @@ cache_rpm_dump () {
 %php_major_version ERROR
 %php_api_version ERROR
 %py_ver ERROR
+%perl_vendorarch ERROR
+%perl_vendorlib ERROR
+# damn. need it here! - copied from /usr/lib/rpm/macros.build
+%tmpdir		%(echo "${TMPDIR:-/tmp}")
+%patchset_source(f:b:) %(
+	base=%{-b*}%{!-b*:10000};
+	start=$(expr $base + %1);
+	end=$(expr $base + %{?2}%{!?2:%{1}});
+	# we need to call seq twice as it doesn't allow two formats
+	seq -f 'Patch%g:' $start $end > %{tmpdir}/__ps1;
+	seq -f '%{-f*}' %1 %{?2}%{!?2:%{1}} > %{tmpdir}/__ps2;
+	paste %{tmpdir}/__ps{1,2};
+	rm -f %{tmpdir}/__ps{1,2};
+) \
+%{nil}
 EOF
-	case "$RPMBUILD" in
-	rpm)
-		ARGS='-bp'
-		;;
-	rpmbuild)
-		ARGS='--nodigest --nosignature --nobuild'
-		;;
-	esac
 	if [ "$NOINIT" = "yes" ] ; then
-		cat >> .builder-rpmmacros <<'EOF'
+		cat >> $BUILDER_MACROS <<'EOF'
 %_specdir ./
 %_sourcedir ./
 EOF
 	fi
-	$RPMBUILD --rcfile .builder-rpmrc $ARGS $ARGDIRS --nodeps --define "prep $dump" $BCOND $TARGET_SWITCH $SPECFILE 2>&1
+	eval $RPMBUILD --macros "$safe_macrofiles:$BUILDER_MACROS" $QUIET $RPMOPTS $RPMBUILDOPTS $BCOND $TARGET_SWITCH $* 2>&1
+}
+
+cache_rpm_dump() {
+	if [ -n "$DEBUG" ]; then
+		set -x
+		set -v
+	fi
+
+	update_shell_title "cache_rpm_dump"
+	local rpm_dump
+	rpm_dump=`
+		# what we need from dump is NAME, VERSION, RELEASE and PATCHES/SOURCES.
+		dump='%{echo:dummy: PACKAGE_NAME %{name} }%dump'
+		case "$RPMBUILD" in
+		rpm)
+			ARGS='-bp'
+			;;
+		rpmbuild)
+			ARGS='--nodigest --nosignature --nobuild'
+			;;
+		esac
+		minirpm $ARGS --define "'prep $dump'" --nodeps $SPECFILE
 	`
 	if [ $? -gt 0 ]; then
 		error=$(echo "$rpm_dump" | sed -ne '/^error:/,$p')
 		echo "$error" >&2
-		Exit_error err_build_fail;
+		Exit_error err_build_fail
 	fi
 
 	# make small dump cache
@@ -426,9 +474,9 @@ EOF
 	update_shell_title "cache_rpm_dump: OK!"
 }
 
-rpm_dump () {
+rpm_dump() {
 	if [ -z "$rpm_dump_cache" ] ; then
-		echo "internal error: cache_rpm_dump not called!" 1>&2
+		echo "internal error: cache_rpm_dump not called! (missing %prep?)" 1>&2
 	fi
 	echo "$rpm_dump_cache"
 }
@@ -441,19 +489,19 @@ get_icons()
 		return
 	fi
 
-	rpm_dump_cache="kalasaba" NODIST="yes" UPDATE5= get_files $ICONS
+	rpm_dump_cache="kalasaba" NODIST="yes" get_files $ICONS
 }
 
 parse_spec()
 {
 	update_shell_title "parsing specfile"
 	if [ -n "$DEBUG" ]; then
-		set -x;
-		set -v;
+		set -x
+		set -v
 	fi
 
 	# icons are needed for successful spec parse
-	get_icons;
+	get_icons
 
 	cd $SPECS_DIR
 	cache_rpm_dump
@@ -468,9 +516,13 @@ parse_spec()
 
 	PATCHES="`rpm_dump | awk '/PATCHURL[0-9]+/ {print $3}'`"
 	ICONS="`awk '/^Icon:/ {print $2}' ${SPECFILE}`"
-	PACKAGE_NAME=$(rpm_dump | awk '$2 == "PACKAGE_NAME" { print $3}')
-	PACKAGE_VERSION=$(rpm_dump | awk '$2 == "PACKAGE_VERSION" { print $3}')
-	PACKAGE_RELEASE=$(rpm_dump | awk '$2 == "PACKAGE_RELEASE" { print $3}')
+	PACKAGE_NAME=$(rpm_dump | awk '$2 == "PACKAGE_NAME" { print $3; exit}')
+	PACKAGE_VERSION=$(rpm_dump | awk '$2 == "PACKAGE_VERSION" { print $3; exit}')
+	PACKAGE_RELEASE=$(rpm_dump | awk '$2 == "PACKAGE_RELEASE" { print $3; exit}')
+
+	if [ "$PACKAGE_NAME" != "$ASSUMED_NAME" ]; then
+		echo "WARNING! Spec name ($ASSUMED_NAME) does not agree with package name ($PACKAGE_NAME)"
+	fi
 
 	if [ -n "$BE_VERBOSE" ]; then
 		echo "- Sources :  `nourl $SOURCES`"
@@ -495,8 +547,8 @@ parse_spec()
 Exit_error()
 {
 	if [ -n "$DEBUG" ]; then
-		set -x;
-		set -v;
+		set -x
+		set -v
 	fi
 
 	cd "$__PWD"
@@ -504,19 +556,22 @@ Exit_error()
 	case "$1" in
 		"err_no_spec_in_cmdl" )
 			remove_build_requires
-			echo "ERROR: spec file name not specified.";
+			echo "ERROR: spec file name not specified."
+			exit 2 ;;
+		"err_invalid_cmdline" )
+			echo "ERROR: invalid command line arg ($2)."
 			exit 2 ;;
 		"err_no_spec_in_repo" )
 			remove_build_requires
-			echo "Error: spec file not stored in CVS repo.";
+			echo "Error: spec file not stored in CVS repo."
 			exit 3 ;;
 		"err_no_source_in_repo" )
 			remove_build_requires
-			echo "Error: some source, patch or icon files not stored in CVS repo. ($2)";
+			echo "Error: some source, patch or icon files not stored in CVS repo. ($2)"
 			exit 4 ;;
 		"err_build_fail" )
 			remove_build_requires
-			echo "Error: package build failed. (${2:-no more info})";
+			echo "Error: package build failed. (${2:-no more info})"
 			exit 5 ;;
 		"err_no_package_data" )
 			remove_build_requires
@@ -524,17 +579,20 @@ Exit_error()
 			exit 6 ;;
 		"err_tag_exists" )
 			remove_build_requires
-			echo "Tag ${2} already exists (spec release: ${3}).";
+			echo "Tag ${2} already exists (spec release: ${3})."
 			exit 9 ;;
 		"err_fract_rel" )
 			remove_build_requires
-			echo "Release ${2} not integer and not a snapshot.";
+			echo "Release ${2} not integer and not a snapshot."
 			exit 10 ;;
 		"err_branch_exists" )
 			remove_build_requires
-			echo "Tree branch already exists (${2}).";
+			echo "Tree branch already exists (${2})."
 			exit 11 ;;
-
+		"err_acl_deny" )
+			remove_build_requires
+			echo "Error: conditions reject building this spec (${2})."
+			exit 12 ;;
 	esac
 	echo "Unknown error."
 	exit 100
@@ -543,13 +601,13 @@ Exit_error()
 init_builder()
 {
 	if [ -n "$DEBUG" ]; then
-		set -x;
-		set -v;
+		set -x
+		set -v
 	fi
 
 	if [ "$NOINIT" != "yes" ] ; then
-		SOURCE_DIR="`eval $RPM $RPMOPTS --eval '%{_sourcedir}'`"
-		SPECS_DIR="`eval $RPM $RPMOPTS --eval '%{_specdir}'`"
+		SOURCE_DIR="`eval $RPM $RPMOPTS --define '"name $ASSUMED_NAME"' --eval '%{_sourcedir}'`"
+		SPECS_DIR="`eval $RPM $RPMOPTS --define '"name $ASSUMED_NAME"' --eval '%{_specdir}'`"
 	else
 		SOURCE_DIR="."
 		SPECS_DIR="."
@@ -564,13 +622,13 @@ get_spec()
 	update_shell_title "get_spec"
 
 	if [ -n "$DEBUG" ]; then
-		set -x;
-		set -v;
+		set -x
+		set -v
 	fi
 
 	cd "$SPECS_DIR"
 	if [ ! -f "$SPECFILE" ]; then
-		SPECFILE="`basename $SPECFILE .spec`.spec";
+		SPECFILE="`basename $SPECFILE .spec`.spec"
 	fi
 	if [ "$NOCVSSPEC" != "yes" ]; then
 
@@ -583,7 +641,7 @@ get_spec()
 	fi
 
 	if [ ! -f "$SPECFILE" ]; then
-		Exit_error err_no_spec_in_repo;
+		Exit_error err_no_spec_in_repo
 	fi
 
 	if [ "$CHMOD" = "yes" -a -n "$SPECFILE" ]; then
@@ -755,6 +813,17 @@ cvsup()
 	return $result
 }
 
+# returns true if "$1" is ftp, http or https protocol url
+is_url()
+{
+	case "$1" in
+	ftp://*|http://*|https://*)
+		return 0
+	;;
+	esac
+	return 1
+}
+
 update_md5()
 {
 	if [ $# -eq 0 ]; then
@@ -763,8 +832,8 @@ update_md5()
 
 	update_shell_title "update md5"
 	if [ -n "$DEBUG" ]; then
-		set -x;
-		set -v;
+		set -x
+		set -v
 	fi
 
 	cd "$SOURCE_DIR"
@@ -775,13 +844,11 @@ update_md5()
 	for i in "$@"; do
 		local fp=$(nourl "$i")
 		local srcno=$(src_no "$i")
-		if [ -n "$UPDATE5" ]; then
-			if [ -n "$ADD5" ]; then
-				[ "$fp" = "$i" ] && continue # FIXME what is this check doing?
-				grep -qiE '^#[ 	]*Source'$srcno'-md5[ 	]*:' $SPECS_DIR/$SPECFILE && continue
-			else
-				grep -qiE '^#[ 	]*Source'$srcno'-md5[ 	]*:' $SPECS_DIR/$SPECFILE || continue
-			fi
+		if [ -n "$ADD5" ]; then
+			[ "$fp" = "$i" ] && continue # FIXME what is this check doing?
+			grep -qiE '^#[ 	]*Source'$srcno'-md5[ 	]*:' $SPECS_DIR/$SPECFILE && continue
+		else
+			grep -qiE '^#[ 	]*Source'$srcno'-md5[ 	]*:' $SPECS_DIR/$SPECFILE || continue
 		fi
 		if [ ! -f "$fp" ] || [ $ALWAYS_CVSUP = "yes" ]; then
 			need_files="$need_files $i"
@@ -797,17 +864,17 @@ update_md5()
 	for i in "$@"; do
 		local fp=$(nourl "$i")
 		local srcno=$(src_no "$i")
-		if [ -n "$UPDATE5" ] && \
-			( ( [ -n "$ADD5" ] && echo $i | grep -q -E 'ftp://|http://|https://' && \
-			[ -z "$(grep -E -i '^NoSource[ 	]*:[ 	]*'$i'([ 	]|$)' $SPECS_DIR/$SPECFILE)" ] ) || \
-			grep -q -i -E '^#[ 	]*source'$srcno'-md5[ 	]*:' $SPECS_DIR/$SPECFILE )
-		then
-			echo "Updating source-$srcno md5."
+		local md5=$(grep -iE '^#[ 	]*(No)?Source'$srcno'-md5[ 	]*:' $SPECS_DIR/$SPECFILE )
+		if [ -n "$ADD5" ] && is_url $i || [ -n "$md5" ]; then
+			local tag="Source$srcno-md5"
+			if [[ "$md5" == *NoSource* ]]; then
+				tag="NoSource$srcno-md5"
+			fi
 			md5=$(md5sum "$fp" | cut -f1 -d' ')
+			echo "Updating $tag ($md5: $fp)."
 			perl -i -ne '
-			print unless /^\s*#\s*Source'$srcno'-md5\s*:/i;
-			print "# Source'$srcno'-md5:\t'$md5'\n"
-			if /^Source'$srcno'\s*:\s+/;
+				print unless /^\s*#\s*(No)?Source'$srcno'-md5\s*:/i;
+				print "# '$tag':\t'$md5'\n" if /^Source'$srcno'\s*:\s+/;
 			' \
 			$SPECS_DIR/$SPECFILE
 		fi
@@ -834,8 +901,8 @@ get_files()
 	update_shell_title "get_files"
 
 	if [ -n "$DEBUG" ]; then
-		set -x;
-		set -v;
+		set -x
+		set -v
 	fi
 
 	if [ $# -gt 0 ]; then
@@ -877,7 +944,15 @@ get_files()
 						continue
 					fi
 					target="$fp"
-					url=$(distfiles_url "$i")
+
+					# optionally prefer mirror over distfiles if there's mirror
+					# TODO: build url list and then try each url from the list
+					if [ -n "$PREFMIRRORS" ] && [ -z "$NOMIRRORS" ] && im=$(find_mirror "$i") && [ "$im" != "$i" ]; then
+						url="$im"
+					else
+						url=$(distfiles_url "$i")
+					fi
+
 					url_attic=$(distfiles_attic_url "$i")
 					FROM_DISTFILES=1
 					# is $url local file?
@@ -886,9 +961,17 @@ get_files()
 						${GETLOCAL} $url $target
 					else
 						if [ -z "$NOMIRRORS" ]; then
-							url="`find_mirror "$url"`"
+							url=$(find_mirror "$url")
+						fi
+
+						local uri=${url}
+						# make shorter message for distfiles urls
+						if [[ "$uri" = ${PROTOCOL}${DISTFILES_SERVER}* ]] || [[ "$uri" = ${PROTOCOL}${ATTICDISTFILES_SERVER}* ]]; then
+							uri=${uri#${PROTOCOL}${DISTFILES_SERVER}/distfiles/by-md5/?/?/*/}
+							uri=${uri#${PROTOCOL}${ATTICDISTFILES_SERVER}/distfiles/by-md5/?/?/*/}
+							uri="df: $uri"
 						fi
-						update_shell_title "${GETURI%% *}: $url"
+						update_shell_title "${GETURI%% *}: $uri"
 						${GETURI} ${OUTFILEOPT} "$target" "$url" || \
 						if [ "`echo $url | grep -E 'ftp://'`" ]; then
 							update_shell_title "${GETURI2%% *}: $url"
@@ -953,7 +1036,7 @@ get_files()
 
 			# the md5 check must be moved elsewhere as if we've called from update_md5 the md5 is wrong.
 			if [ ! -f "$fp" -a "$FAIL_IF_NO_SOURCES" != "no" ]; then
-				Exit_error err_no_source_in_repo $i;
+				Exit_error err_no_source_in_repo $i
 			fi
 
 			# we check md5 here just only to refetch immediately
@@ -1000,18 +1083,26 @@ get_files()
 
 make_tagver() {
 	if [ -n "$DEBUG" ]; then
-		set -x;
-		set -v;
+		set -x
+		set -v
 	fi
 
 	# Check whether first character of PACKAGE_NAME is legal for tag name
 	if [ -z "${PACKAGE_NAME##[_0-9]*}" -a -z "$TAG_PREFIX" ]; then
 		TAG_PREFIX=tag_
 	fi
-	TAGVER=$TAG_PREFIX$PACKAGE_NAME-`echo $PACKAGE_VERSION | sed -e "s/\./\_/g" -e "s/@/#/g"`-`echo $PACKAGE_RELEASE | sed -e "s/\./\_/g" -e "s/@/#/g"`
+
+	# NOTE: CVS tags may must not contain the characters `$,.:;@'
+	TAGVER=$(echo $TAG_PREFIX$PACKAGE_NAME-$PACKAGE_VERSION-$PACKAGE_RELEASE | tr '[.@]' '[_#]')
+
 	# Remove #kernel.version_release from TAGVER because tagging sources
 	# could occur with different kernel-headers than kernel-headers used at build time.
-	TAGVER=$(echo "$TAGVER" | sed -e 's/#.*//g')
+	# besides, %{_kernel_ver_str} is not expanded.
+
+	# TAGVER=auto-ac-madwifi-ng-0-0_20070225_1#%{_kernel_ver_str}
+	# TAGVER=auto-ac-madwifi-ng-0-0_20070225_1
+
+	TAGVER=${TAGVER%#*}
 	echo -n "$TAGVER"
 }
 
@@ -1020,16 +1111,16 @@ tag_files()
 	TAG_FILES="$@"
 
 	if [ -n "$DEBUG" ]; then
-		set -x;
-		set -v;
+		set -x
+		set -v
 	fi
 
 	echo "Version: $PACKAGE_VERSION"
 	echo "Release: $PACKAGE_RELEASE"
 
-	TAGVER=`make_tagver`
-
+	local TAGVER
 	if [ "$TAG_VERSION" = "yes" ]; then
+		TAGVER=`make_tagver`
 		echo "CVS tag: $TAGVER"
 	fi
 	if [ -n "$TAG" ]; then
@@ -1057,22 +1148,22 @@ tag_files()
 	if [ "$tag_files" ]; then
 		if [ "$TAG_VERSION" = "yes" ]; then
 			update_shell_title "tag sources: $TAGVER"
-			cvs $OPTIONS $TAGVER $tag_files
+			cvs $OPTIONS $TAGVER $tag_files || exit
 		fi
 		if [ -n "$TAG" ]; then
 			update_shell_title "tag sources: $TAG"
-			cvs $OPTIONS $TAG $tag_files
+			cvs $OPTIONS $TAG $tag_files || exit
 		fi
 	fi
 
 	cd "$SPECS_DIR"
 	if [ "$TAG_VERSION" = "yes" ]; then
 		update_shell_title "tag spec: $TAGVER"
-		cvs $OPTIONS $TAGVER $SPECFILE
+		cvs $OPTIONS $TAGVER $SPECFILE || exit
 	fi
 	if [ -n "$TAG" ]; then
 		update_shell_title "tag spec: $TAG"
-		cvs $OPTIONS $TAG $SPECFILE
+		cvs $OPTIONS $TAG $SPECFILE || exit
 	fi
 }
 
@@ -1080,13 +1171,13 @@ branch_files()
 {
 	TAG=$1
 	echo "CVS branch tag: $TAG"
-	shift;
+	shift
 
 	TAG_FILES="$@"
 
 	if [ -n "$DEBUG" ]; then
-		set -x;
-		set -v;
+		set -x
+		set -v
 	fi
 
 	local OPTIONS="tag $CVS_FORCE -b"
@@ -1104,21 +1195,33 @@ branch_files()
 		fi
 	done
 	if [ "$tag_files" ]; then
-		cvs $OPTIONS $TAG $tag_files
+		cvs $OPTIONS $TAG $tag_files || exit
 	fi
 
 	cd "$SPECS_DIR"
-	cvs $OPTIONS $TAG $SPECFILE
+	cvs $OPTIONS $TAG $SPECFILE || exit
 }
 
 
+# this function should exit early if package can't be built for this arch
+# this avoids unneccessary BR filling.
+check_buildarch() {
+	local out ret
+	out=$(minirpm --short-circuit -bp --define "'prep exit 0'" --nodeps $SPECFILE 2>&1)
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		echo >&2 "$out"
+		exit $ret
+	fi
+}
+
 
 build_package()
 {
 	update_shell_title "build_package"
 	if [ -n "$DEBUG" ]; then
-		set -x;
-		set -v;
+		set -x
+		set -v
 	fi
 
 	cd "$SPECS_DIR"
@@ -1136,12 +1239,16 @@ build_package()
 		if [ -n "$TNEWVER" ]; then
 			TOLDVER=`echo $TNOTIFY | awk '{ print $3; }'`
 			echo "New version found, updating spec file to version " $TNEWVER
-			cp -f $SPECFILE $SPECFILE.bak
+			if [ "$REVERT_BROKEN_UPGRADE" = "yes" ]; then
+				cp -f $SPECFILE $SPECFILE.bak
+			fi
 			chmod +w $SPECFILE
 			eval "perl -pi -e 's/Version:\t"$TOLDVER"/Version:\t"$TNEWVER"/gs' $SPECFILE"
 			eval "perl -pi -e 's/Release:\t[1-9]{0,4}/Release:\t0.1/' $SPECFILE"
-			parse_spec;
-			NODIST="yes" UPDATE5="yes" get_files $SOURCES $PATCHES;
+			parse_spec
+			NODIST="yes" get_files $SOURCES $PATCHES
+			update_md5 $SOURCES
+
 			unset TOLDVER TNEWVER TNOTIFY
 		fi
 	fi
@@ -1156,6 +1263,13 @@ build_package()
 			BUILD_SWITCH="-bs --nodeps" ;;
 		build-prep )
 			BUILD_SWITCH="-bp --nodeps" ;;
+		build-build )
+			BUILD_SWITCH="-bc" ;;
+		build-install )
+			BUILD_SWITCH="-bi" ;;
+		build-list )
+			BUILD_SWITCH="-bl" ;;
+
 	esac
 
 	update_shell_title "build_package: $COMMAND"
@@ -1164,7 +1278,7 @@ build_package()
 		if [ -d "$LOG" ]; then
 			echo "Log file $LOG is a directory."
 			echo "Parse error in the spec?"
-			Exit_error err_build_fail;
+			Exit_error err_build_fail
 		fi
 		if [ -n "$LASTLOG_FILE" ]; then
 			echo "LASTLOG=$LOG" > $LASTLOG_FILE
@@ -1187,9 +1301,11 @@ build_package()
 	if [ "$RETVAL" -ne "0" ]; then
 		if [ -n "$TRY_UPGRADE" ]; then
 			echo "\n!!! Package with new version cannot be built automagically\n"
-			mv -f $SPECFILE.bak $SPECFILE
+			if [ "$REVERT_BROKEN_UPGRADE" = "yes" ]; then
+				mv -f $SPECFILE.bak $SPECFILE
+			fi
 		fi
-		Exit_error err_build_fail;
+		Exit_error err_build_fail
 	fi
 	unset BUILD_SWITCH
 }
@@ -1223,22 +1339,7 @@ find_spec_bcond() {
 	}' $SPEC | LC_ALL=C sort -u
 }
 
-set_bconds_values()
-{
-	update_shell_title "set bcond values"
-
-	AVAIL_BCONDS_WITHOUT=""
-	AVAIL_BCONDS_WITH=""
-	if `grep -q ^%bcond ${SPECFILE}`; then
-		BCOND_VERSION="NEW"
-	elif `egrep -q ^#\ *_with ${SPECFILE}`; then
-		BCOND_VERSION="OLD"
-	else
-		return
-	fi
-
-	local bcond_avail=$(find_spec_bcond $SPECFILE)
-
+process_bcondrc() {
 	# expand bconds from ~/.bcondrc
 	# The file structure is like gentoo's package.use:
 	# ---
@@ -1248,38 +1349,62 @@ set_bconds_values()
 	# php +mysqli
 	# ---
 	if ([ -f $HOME/.bcondrc ] || ([ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ])); then
-		SN=${SPECFILE%%\.spec}
+		:
+	else
+		return
+	fi
+
+	SN=${SPECFILE%%\.spec}
 
-		local bcondrc=$HOME/.bcondrc
-		[ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ] && bcondrc=$HOME_ETC/.bcondrc
+	local bcondrc=$HOME/.bcondrc
+	[ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ] && bcondrc=$HOME_ETC/.bcondrc
 
-		while read pkg flags; do
-			# ignore comments
-			[[ "$pkg" == \#* ]] && continue
+	local bcond_avail=$(find_spec_bcond $SPECFILE)
 
-			# any package or current package?
-			if [ "$pkg" = "*" ] || [ "$pkg" = "$PACKAGE_NAME" ] || [ "$pkg" = "$SN" ]; then
-				for flag in $flags; do
-					local opt=${flag#[+-]}
+	while read pkg flags; do
+		# ignore comments
+		[[ "$pkg" == \#* ]] && continue
 
-					# use only flags which are in this package.
-					if [[ $bcond_avail = *${opt}* ]]; then
-						if [[ $flag = -* ]]; then
-							if [[ $BCOND != *--with?${opt}* ]]; then
-								BCOND="$BCOND --without $opt"
-							fi
-						else
-							if [[ $BCOND != *--without?${opt}* ]]; then
-								BCOND="$BCOND --with $opt"
-							fi
+		# any package or current package?
+		if [ "$pkg" = "*" ] || [ "$pkg" = "$PACKAGE_NAME" ] || [ "$pkg" = "$SN" ]; then
+			for flag in $flags; do
+				local opt=${flag#[+-]}
+
+				# use only flags which are in this package.
+				if [[ $bcond_avail = *${opt}* ]]; then
+					if [[ $flag = -* ]]; then
+						if [[ $BCOND != *--with?${opt}* ]]; then
+							BCOND="$BCOND --without $opt"
+						fi
+					else
+						if [[ $BCOND != *--without?${opt}* ]]; then
+							BCOND="$BCOND --with $opt"
 						fi
 					fi
-				done
-			fi
-		done < $bcondrc
-		update_shell_title "parse ~/.bcondrc: DONE!"
+				fi
+			done
+		fi
+	done < $bcondrc
+	update_shell_title "parse ~/.bcondrc: DONE!"
+}
+
+set_bconds_values()
+{
+	update_shell_title "set bcond values"
+
+	AVAIL_BCONDS_WITHOUT=""
+	AVAIL_BCONDS_WITH=""
+	if `grep -q ^%bcond ${SPECFILE}`; then
+		BCOND_VERSION="NEW"
+	elif `egrep -q ^#\ *_with ${SPECFILE}`; then
+		BCOND_VERSION="OLD"
+	else
+		return
 	fi
 
+	local bcond_avail=$(find_spec_bcond $SPECFILE)
+	process_bcondrc "$SPECFILE"
+
 	update_shell_title "parse bconds"
 	case "${BCOND_VERSION}" in
 		NONE)
@@ -1503,37 +1628,39 @@ fetch_build_requires()
 	if [ "${FETCH_BUILD_REQUIRES}" = "yes" ]; then
 		update_shell_title "fetch build requires"
 		if [ "$FETCH_BUILD_REQUIRES_RPMGETDEPS" = "yes" ]; then
-			local CONF=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^\-/ { print $3 } ' | _rpm_cnfl_check | xargs)
+			# TODO: Conflicts list doesn't check versions
+			local CNFL=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^\-/ { print $3 } ' | _rpm_cnfl_check | xargs)
 			local DEPS=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^\+/ { print $3 } ' | _rpm_prov_check | xargs)
 
-			update_shell_title "poldek: update indexes"
-			if [ -n "$CONF" ] || [ -n "$DEPS" ]; then
+			if [ -n "$CNFL" ] || [ -n "$DEPS" ]; then
+				echo "fetch builderequires: install $DEPS; remove $CNFL"
+				update_shell_title "poldek: install $DEPS; remove $CNFL"
 				$SU_SUDO /usr/bin/poldek -q --update || $SU_SUDO /usr/bin/poldek -q --upa
 			fi
-			if [ -n "$CONF" ]; then
-				update_shell_title "uninstall conflicting packages: $CONF"
-				echo "Trying to uninstall conflicting packages ($CONF):"
-				$SU_SUDO /usr/bin/poldek --noask --nofollow -ev $CONF
+			if [ -n "$CNFL" ]; then
+				update_shell_title "uninstall conflicting packages: $CNFL"
+				echo "Trying to uninstall conflicting packages ($CNFL):"
+				$SU_SUDO /usr/bin/poldek --noask --nofollow -ev $CNFL
 			fi
 
-		while [ "$DEPS" ]; do
-				update_shell_title "install deps: $DEPS"
-				echo "Trying to install dependencies ($DEPS):"
-				local log=.${SPECFILE}_poldek.log
-				$SU_SUDO /usr/bin/poldek --caplookup -uGq $DEPS | tee $log
-				failed=$(awk -F: '/^error:/{print $2}' $log)
-				rm -f $log
-				local ok
-				if [ -n "$failed" ]; then
-					for package in $failed; do
-						# FIXME: sanitise, deps could be not .spec files
-						spawn_sub_builder -bb $package && ok="$ok $package"
-					done
-					DEPS="$ok"
-				else
-					DEPS=""
-				fi
-		done
+			while [ "$DEPS" ]; do
+					update_shell_title "install deps: $DEPS"
+					echo "Trying to install dependencies ($DEPS):"
+					local log=.${SPECFILE}_poldek.log
+					$SU_SUDO /usr/bin/poldek --caplookup -uGq $DEPS | tee $log
+					failed=$(awk -F: '/^error:/{print $2}' $log)
+					rm -f $log
+					local ok
+					if [ -n "$failed" ]; then
+						for package in $failed; do
+							# FIXME: sanitise, deps could be not .spec files
+							spawn_sub_builder -bb $package && ok="$ok $package"
+						done
+						DEPS="$ok"
+					else
+						DEPS=""
+					fi
+			done
 			return
 		fi
 
@@ -1615,11 +1742,11 @@ fetch_build_requires()
 							if [ "$package_name" = "$package" ]; then
 								echo -ne "Installing BuildRequired package:\t$package_name\n"
 								update_shell_title "Installing BuildRequired package: ${package_name}"
-								install_required_packages $package;
+								install_required_packages $package
 							else
 								echo -ne "Installing (sub)Required package:\t$package_name\n"
 								update_shell_title "Installing (sub)Required package: ${package_name}"
-								install_required_packages $package_name;
+								install_required_packages $package_name
 							fi
 							case $? in
 								0)
@@ -1631,7 +1758,7 @@ fetch_build_requires()
 									echo -ne "Package installation failed:\t$package_name\n"
 									run_sub_builder $package_name
 									if [ $? -eq 0 ]; then
-										install_required_packages $package_name;
+										install_required_packages $package_name
 										case $? in
 											0)
 												INSTALLED_PACKAGES="$package_name $INSTALLED_PACKAGES"
@@ -1651,7 +1778,7 @@ fetch_build_requires()
 						echo -ne "Package installation failed:\t$package\n"
 						run_sub_builder $package
 						if [ $? -eq 0 ]; then
-							install_required_packages $package;
+							install_required_packages $package
 							case $? in
 								0)
 									INSTALLED_PACKAGES="$package_name $INSTALLED_PACKAGES"
@@ -1687,7 +1814,7 @@ init_rpm_dir() {
 
 	mkdir -p $TOP_DIR/{RPMS,BUILD,SRPMS}
 	cd $TOP_DIR
-	cvs -d $CVSROOT co SOURCES/.cvsignore SPECS/{mirrors,adapter{,.awk},fetchsrc_request,builder,repackage.sh}
+	cvs -d $CVSROOT co SOURCES/.cvsignore SPECS/{mirrors,adapter{,.awk},fetchsrc_request,builder,{relup,compile,repackage}.sh}
 
 	init_builder
 
@@ -1704,26 +1831,23 @@ init_rpm_dir() {
 #---------------------------------------------
 # main()
 
-if [ "$#" = 0 ]; then
-	usage;
+if [ $# = 0 ]; then
+	usage
 	exit 1
 fi
 
-while test $# -gt 0
-do
+while [ $# -gt 0 ]; do
 	case "${1}" in
-		-5 | --update-md5 )
-			COMMAND="update_md5";
+		-5 | --update-md5)
+			COMMAND="update_md5"
 			NODIST="yes"
 			NOCVSSPEC="yes"
-			UPDATE5="yes"
 			shift ;;
 		-a5 | --add-md5 )
-			COMMAND="update_md5";
+			COMMAND="update_md5"
 			NODIST="yes"
 			NOCVS="yes"
 			NOCVSSPEC="yes"
-			UPDATE5="yes"
 			ADD5="yes"
 			shift ;;
 		-n5 | --no-md5 )
@@ -1733,16 +1857,24 @@ do
 			DEBUG="yes"; shift ;;
 		-V | --version )
 			COMMAND="version"; shift ;;
+		--short-version )
+			COMMAND="short-version"; shift ;;
 		-a | --as_anon )
 			CVSROOT=":pserver:cvs@$CVS_SERVER:/cvsroot"; shift ;;
 		-b | -ba | --build )
 			COMMAND="build"; shift ;;
 		-bb | --build-binary )
 			COMMAND="build-binary"; shift ;;
-		-bs | --build-source )
-			COMMAND="build-source"; shift ;;
+		-bc )
+			COMMAND="build-build"; shift ;;
+		-bi )
+			COMMAND="build-install"; shift ;;
+		-bl )
+			COMMAND="build-list"; shift ;;
 		-bp | --build-prep )
 			COMMAND="build-prep"; shift ;;
+		-bs | --build-source )
+			COMMAND="build-source"; shift ;;
 		-B | --branch )
 			COMMAND="branch"; shift; TAG="${1}"; shift;;
 		-c | --clean )
@@ -1788,11 +1920,14 @@ do
 			NOSRCS="yes"
 			ALWAYS_CVSUP="no"
 			shift;;
+		-pm | --prefer-mirrors )
+			PREFMIRRORS="yes"
+			shift;;
 		--no-init )
 			NOINIT="yes"
 			shift;;
 		--opts )
-			shift; RPMOPTS="$RPM_OPTS ${1}"; shift ;;
+			shift; RPMOPTS="${RPMOPTS} ${1}"; shift ;;
 		--nopatch | -np )
 			shift; RPMOPTS="${RPMOPTS} --define \"patch${1} : ignoring patch${1}; exit 1; \""; shift ;;
 		--with | --without )
@@ -1826,6 +1961,8 @@ do
 			CVSDATE="${2}"; shift 2 ;;
 		-r | --cvstag )
 			shift; CVSTAG="${1}"; shift ;;
+		-A)
+			shift; CVSTAG="HEAD"; ;;
 		-R | --fetch-build-requires)
 			FETCH_BUILD_REQUIRES="yes"
 			NOT_INSTALLED_PACKAGES=
@@ -1836,6 +1973,9 @@ do
 		-FRB | --force-remove-build-requires)
 			REMOVE_BUILD_REQUIRES="force"
 			shift ;;
+		-sc | --sources-cvs)
+			COMMAND="list-sources-cvs"
+			shift ;;
 		-sd | --sources-distfiles)
 			COMMAND="list-sources-distfiles"
 			shift ;;
@@ -1852,17 +1992,17 @@ do
 			COMMAND="list-sources-urls"
 			shift ;;
 		-Tvs | --tag-version-stable )
-			COMMAND="tag";
+			COMMAND="tag"
 			TAG="STABLE"
 			TAG_VERSION="yes"
 			shift;;
 		-Ts | --tag-stable )
-			COMMAND="tag";
+			COMMAND="tag"
 			TAG="STABLE"
 			TAG_VERSION="no"
 			shift;;
 		-Tv | --tag-version )
-			COMMAND="tag";
+			COMMAND="tag"
 			TAG=""
 			TAG_VERSION="yes"
 			shift;;
@@ -1873,7 +2013,7 @@ do
 			TEST_TAG="yes"
 			shift;;
 		-T | --tag )
-			COMMAND="tag";
+			COMMAND="tag"
 			shift
 			TAG="$1"
 			TAG_VERSION="no"
@@ -1886,13 +2026,12 @@ do
 			UPDATE="yes"
 			NOCVSSPEC="yes"
 			NODIST="yes"
-			UPDATE5="yes"
 			shift ;;
 		-Upi | --update-poldek-indexes )
 			UPDATE_POLDEK_INDEXES="yes"
 			shift ;;
 		--init-rpm-dir)
-			COMMAND="init_rpm_dir";
+			COMMAND="init_rpm_dir"
 			shift ;;
 		-u | --try-upgrade )
 			TRY_UPGRADE="1"; shift ;;
@@ -1912,8 +2051,16 @@ do
 				RPMOPTS="${RPMOPTS} --define \"${MACRO} ${VALUE}\""
 			fi
 			;;
+		--short-circuit)
+			RPMBUILDOPTS="${RPMBUILDOPTS} --short-circuit"
+			shift
+			;;
 		--show-bconds | -show-bconds | -print-bconds | --print-bconds | -display-bconds | --display-bconds )
-			SHOW_BCONDS="yes"
+			COMMAND="show_bconds"
+			shift
+			;;
+		--show-bcond-args)
+			COMMAND="show_bcond_args"
 			shift
 			;;
 		--nodeps)
@@ -1921,22 +2068,27 @@ do
 			RPMOPTS="${RPMOPTS} --nodeps"
 			;;
 		-debug)
-			RPMBUILDOPTS="${RPMBUILDOPTS} -debug"; shift ;;
+			RPMBUILDOPTS="${RPMBUILDOPTS} -debug"; shift
+			;;
+		-* )
+			Exit_error err_invalid_cmdline "$1"
+			;;
 		* )
 			SPECFILE="${1}"
 			# check if specname was passed as specname:cvstag
 			if [ "${SPECFILE##*:}" != "${SPECFILE}" ]; then
-				CVSTAG="${SPECFILE##*:}";
-				SPECFILE="${SPECFILE%%:*}";
+				CVSTAG="${SPECFILE##*:}"
+				SPECFILE="${SPECFILE%%:*}"
 			fi
+			ASSUMED_NAME="$(basename ${SPECFILE%%.spec})"
 			shift
 	esac
 done
 
-if [ -z "$CVSTAG" ]; then
+if [ -f CVS/Entries ] && [ -z "$CVSTAG" ]; then
 	CVSTAG=$(awk -vSPECFILE="${SPECFILE%.spec}.spec" -F/ '$2 == SPECFILE && $6 ~ /^T/{print substr($6, 2)}' CVS/Entries)
 	if [ "$CVSTAG" ]; then
-		echo "builder: Stick tag $CVSTAG active. Use -r TAGNAME to override."
+		echo >&2 "builder: Stick tag $CVSTAG active. Use -r TAGNAME to override."
 	fi
 elif [ "$CVSTAG" = "HEAD" ]; then
 	# assume -r HEAD is same as -A
@@ -1944,8 +2096,8 @@ elif [ "$CVSTAG" = "HEAD" ]; then
 fi
 
 if [ -n "$DEBUG" ]; then
-	set -x;
-	set -v;
+	set -x
+	set -v
 fi
 
 if [ -n "$TARGET" ]; then
@@ -1965,16 +2117,36 @@ fi
 
 update_shell_title "$COMMAND"
 case "$COMMAND" in
-	"build" | "build-binary" | "build-source" | "build-prep" )
-		init_builder;
+	"show_bconds")
+		init_builder
+		if [ -n "$SPECFILE" ]; then
+			get_spec > /dev/null
+			parse_spec
+			set_bconds_values
+			display_bconds
+		fi
+		;;
+	"show_bcond_args")
+		init_builder
+		if [ -n "$SPECFILE" ]; then
+			get_spec > /dev/null
+			parse_spec
+			set_bconds_values
+			echo "$BCOND"
+		fi
+		;;
+	"build" | "build-binary" | "build-source" | "build-prep" | "build-build" | "build-install" | "build-list")
+		init_builder
 		if [ -n "$SPECFILE" ]; then
-			get_spec;
-			parse_spec;
-			set_bconds_values;
-			display_bconds;
-			display_branches;
-			[ X"$SHOW_BCONDS" = X"yes" ] && exit 0
-			fetch_build_requires;
+			get_spec
+			parse_spec
+			set_bconds_values
+			display_bconds
+			display_branches
+			if [ "$COMMAND" != "build-source" ]; then
+				check_buildarch
+			fi
+			fetch_build_requires
 			if [ "$INTEGER_RELEASE" = "yes" ]; then
 				echo "Checking release $PACKAGE_RELEASE..."
 				if echo $PACKAGE_RELEASE | grep -q '^[^.]*\.[^.]*$' 2>/dev/null ; then
@@ -1982,8 +2154,18 @@ case "$COMMAND" in
 				fi
 			fi
 
+			# ./builder -bs test.spec -r AC-branch -Tp auto-ac- -tt
 			if [ -n "$TEST_TAG" ]; then
-				TAGVER=`make_tagver`
+				# - do not allow utf8 encoded specs on AC-branch
+				if [ "$CVSTAG" = "AC-branch-disabled" ]; then
+					local t
+					t=$(grep '^Summary(.*\.UTF-8):' $SPECFILE)
+					if [ "$t" ]; then
+						Exit_error err_acl_deny "UTF-8 .specs not allowed on $CVSTAG"
+					fi
+				fi
+
+				local TAGVER=`make_tagver`
 				echo "Searching for tag $TAGVER..."
 				TAGREL=$(cvs status -v $SPECFILE | grep -E "^[[:space:]]*${TAGVER}[[[:space:]]" | sed -e 's#.*(revision: ##g' -e 's#).*##g')
 				if [ -n "$TAGREL" ]; then
@@ -1999,6 +2181,7 @@ case "$COMMAND" in
 						Exit_error err_branch_exists "$TAG_STATUS"
 					fi
 				fi
+
 			fi
 
 			if [ -n "$NOSOURCE0" ] ; then
@@ -2006,31 +2189,38 @@ case "$COMMAND" in
 			fi
 			get_files $SOURCES $PATCHES
 			check_md5 $SOURCES
-			build_package;
+			build_package
 			if [ "$UPDATE_POLDEK_INDEXES" = "yes" -a "$COMMAND" != "build-prep" ]; then
 				run_poldek --sdir="${POLDEK_INDEX_DIR}" --mkidxz
 			fi
-			remove_build_requires;
+			remove_build_requires
 		else
-			Exit_error err_no_spec_in_cmdl;
+			Exit_error err_no_spec_in_cmdl
 		fi
 		;;
 	"branch" )
-		init_builder;
+		init_builder
 		if [ -n "$SPECFILE" ]; then
-			get_spec;
-			parse_spec;
+			get_spec
+			parse_spec
+			# don't fetch sources from remote locations
+			new_SOURCES=""
+			for file in $SOURCES; do
+				[ -n "`src_md5 $file`" ] && continue
+				new_SOURCES="$new_SOURCES $file"
+			done
+			SOURCES="$new_SOURCES"
 			get_files $SOURCES $PATCHES
 			check_md5 $SOURCES
 			branch_files $TAG $SOURCES $PATCHES $ICONS
 		else
-			Exit_error err_no_spec_in_cmdl;
+			Exit_error err_no_spec_in_cmdl
 		fi
 		;;
 	"get" )
-		init_builder;
+		init_builder
 		if [ -n "$SPECFILE" ]; then
-			get_spec;
+			get_spec
 			parse_spec
 
 			if [ -n "$NOSOURCE0" ] ; then
@@ -2039,13 +2229,13 @@ case "$COMMAND" in
 			get_files $SOURCES $PATCHES
 			check_md5 $SOURCES
 		else
-			Exit_error err_no_spec_in_cmdl;
+			Exit_error err_no_spec_in_cmdl
 		fi
 		;;
 	"update_md5" )
-		init_builder;
+		init_builder
 		if [ -n "$SPECFILE" ]; then
-			get_spec;
+			get_spec
 			parse_spec
 
 			if [ -n "$NOSOURCE0" ] ; then
@@ -2053,16 +2243,16 @@ case "$COMMAND" in
 			fi
 			update_md5 $SOURCES
 		else
-			Exit_error err_no_spec_in_cmdl;
+			Exit_error err_no_spec_in_cmdl
 		fi
 		;;
 	"tag" )
 		NOURLS=1
 		NODIST="yes"
-		init_builder;
+		init_builder
 		if [ -n "$SPECFILE" ]; then
-			get_spec;
-			parse_spec;
+			get_spec
+			parse_spec
 
 			# don't fetch sources from remote locations
 			new_SOURCES=""
@@ -2075,7 +2265,7 @@ case "$COMMAND" in
 			check_md5 $SOURCES
 			tag_files $SOURCES $PATCHES $ICONS
 		else
-			Exit_error err_no_spec_in_cmdl;
+			Exit_error err_no_spec_in_cmdl
 		fi
 		;;
 	"mr-proper" )
@@ -2136,13 +2326,30 @@ case "$COMMAND" in
 			fi
 		done
 		;;
+	"list-sources-cvs" )
+		init_builder
+#		NOCVSSPEC="yes"
+		DONT_PRINT_REVISION="yes"
+		get_spec
+		parse_spec
+		for SAP in $SOURCES $PATCHES; do
+			if [ -z "$(src_md5 "$SAP")" ]; then
+				echo $SAP | awk '{gsub(/.*\//,"") ; print}'
+			fi
+		done
+		;;
 	"init_rpm_dir")
 		init_rpm_dir
 		;;
 	"usage" )
-		usage;;
+		usage
+		;;
+	"short-version" )
+		echo "$VERSION"
+		;;
 	"version" )
-		echo "$VERSION";;
+		echo "$VERSIONSTRING"
+		;;
 esac
 if [ -f "`pwd`/.${SPECFILE}_INSTALLED_PACKAGES" -a "$REMOVE_BUILD_REQUIRES" != "" ]; then
 	rm "`pwd`/.${SPECFILE}_INSTALLED_PACKAGES"