X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=builder.sh;h=1041d4a4f14a4498420313b33d59ec40b0a740b5;hb=0f5587227ad77465ad02a75dcb08b342489bb53f;hp=172252a3da26b98d17f2014ec21db5835da2eb8a;hpb=c05227ac32026a378243f6fb90a37b3bc35a7e13;p=packages%2Frpm-build-tools.git

diff --git a/builder.sh b/builder.sh
index 172252a..1041d4a 100644
--- a/builder.sh
+++ b/builder.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/ksh
 # -----------
 # $Id$
 # Exit codes:
@@ -22,7 +22,7 @@
 
 VERSION="\
 Build package utility from PLD Linux CVS repository
-v0.14 (C) 1999-2006 Free Penguins".
+v0.17 (C) 1999-2006 Free Penguins".
 PATH="/bin:/usr/bin:/usr/sbin:/sbin:/usr/X11R6/bin"
 
 COMMAND="build"
@@ -37,8 +37,8 @@ NOURLS=""
 NOCVS=""
 NOCVSSPEC=""
 NODIST=""
+NOINIT=""
 UPDATE=""
-UPDATE5=""
 ADD5=""
 NO5=""
 ALWAYS_CVSUP=${ALWAYS_CVSUP:-"yes"}
@@ -61,6 +61,7 @@ LASTLOG_FILE=""
 CHMOD="no"
 CHMOD_MODE="0444"
 RPMOPTS=""
+RPMBUILDOPTS=""
 BCOND=""
 GROUP_BCONDS="no"
 CVSIGNORE_DF="no"
@@ -77,22 +78,28 @@ CVS_RETRIES=${MAX_CVS_RETRIES:-1000}
 
 CVSTAG=""
 RES_FILE=""
+CVS_FORCE=""
 
 CVS_SERVER="cvs.pld-linux.org"
 DISTFILES_SERVER="://distfiles.pld-linux.org"
 ATTICDISTFILES_SERVER="://attic-distfiles.pld-linux.org"
 
 DEF_NICE_LEVEL=19
+SCHEDTOOL="auto"
 
 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"
+	FETCH_BUILD_REQUIRES_RPMGETDEPS="yes"
 else
-	 FETCH_BUILD_REQUIRES_RPMGETDEPS="no"
+	FETCH_BUILD_REQUIRES_RPMGETDEPS="no"
 fi
 
 # Here we load saved user environment used to
@@ -111,6 +118,7 @@ fi
 #REMOVE_BUILD_REQUIRES="force"
 #GROUP_BCONDS="yes"
 #LOGFILE='../LOGS/log.$PACKAGE_NAME.$DATE'
+#TITLECHANGE=no
 #
 SU_SUDO=""
 if [ -n "$HOME_ETC" ]; then
@@ -121,7 +129,13 @@ fi
 
 [ -f "$USER_CFG" ] && . "$USER_CFG"
 
-wget --help 2>&1 | grep -q ' \-\-no-check\-certificate ' && WGET_OPTS="$WGET_OPTS --no-check-certificate"
+if [ "$SCHEDTOOL" = "auto" ]; then
+	if [ -x /usr/bin/schedtool ] && schedtool -B -e echo >/dev/null; then
+		SCHEDTOOL="schedtool -B -e"
+	else
+		SCHEDTOOL="no"
+	fi
+fi
 
 if [ -n "$USE_PROZILLA" ]; then
 	GETURI="proz --no-getch -r -P ./ -t$WGET_RETRIES $PROZILLA_OPTS"
@@ -132,8 +146,9 @@ elif [ -n "$USE_AXEL" ]; then
 	GETURI2="$GETURI"
 	OUTFILEOPT="-o"
 else
-	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 --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"
 
 	GETURI="wget --passive-ftp -c -nd -t$WGET_RETRIES $WGET_OPTS"
 	GETURI2="wget -c -nd -t$WGET_RETRIES $WGET_OPTS"
@@ -161,10 +176,10 @@ run_poldek()
 		if [ -n "$LASTLOG_FILE" ]; then
 			echo "LASTLOG=$LOG" > $LASTLOG_FILE
 		fi
-		(nice -n ${DEF_NICE_LEVEL} ${POLDEK_CMD} `while test $# -gt 0; do echo "$1 ";shift;done` ; echo $? > ${RES_FILE})|tee -a $LOG
+		(${NICE_COMMAND} ${POLDEK_CMD} `while test $# -gt 0; do echo "$1 ";shift;done` ; echo $? > ${RES_FILE})|tee -a $LOG
 		return $exit_pldk
 	else
-		(nice -n ${DEF_NICE_LEVEL} ${POLDEK_CMD} `while test $# -gt 0; do echo "$1 ";shift;done` ; echo $? > ${RES_FILE}) 1>&2 >/dev/null
+		(${NICE_COMMAND} ${POLDEK_CMD} `while test $# -gt 0; do echo "$1 ";shift;done` ; echo $? > ${RES_FILE}) 1>&2 >/dev/null
 		return `cat ${RES_FILE}`
 		rm -rf ${RES_FILE}
 	fi
@@ -178,16 +193,15 @@ 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]
-[{-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] [-Tvn|--tag-version-nest]
-[-Ts|--tag-stable] [-Tn|--tag-nest] [-Tv|--tag-version]
+[-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
@@ -201,14 +215,16 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
 -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),
+-cf, --cvs-force	- use -F when tagging (useful when moving branches)
 -d <cvsroot>, --cvsroot <cvsroot>
                     - setup \$CVSROOT,
 --define <macro> <value>
@@ -231,6 +247,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
+--no-init           - don't initialize builder paths (SPECS and SOURCES)
 -ske,
 --skip-existing-files - skip existing files in get_files
 --opts <rpm opts>   - additional options for rpm
@@ -238,6 +255,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
@@ -246,24 +264,27 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
 -FRB, --force-remove-build-requires
                     - remove all you fetched with -R or --fetch-build-requires
                       remember, this option works without confirmation,
+-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),
+-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
+                      but icon file is absent),
 -sf, --source-files - list sources - bare filenames (intended for offline
                       operations; does not work when Icon field is present
-							 but icon file is absent),
+                      but icon file is absent),
 -sp, --source-paths - list sources - filenames with full local paths (intended for
                       offline operations; does not work when Icon field is present
-							 but icon file is absent),
+                      but icon file is absent),
 -su, --source-urls  - list urls - urls to sources and patches
                       intended for copying urls with spec with lots of macros in urls
 -T <cvstag> , --tag <cvstag>
                     - add cvs tag <cvstag> for files,
 -Tvs, --tag-version-stable
                     - add cvs tags STABLE and NAME-VERSION-RELEASE for files,
--Tvn, --tag-version-nest
-                    - add cvs tags NEST and NAME-VERSION-RELEASE for files,
 -Ts, --tag-stable
                     - add cvs tag STABLE for files,
--Tn, --tag-nest
-                    - add cvs tag NEST for files,
 -Tv, --tag-version
                     - add cvs tag NAME-VERSION-RELEASE for files,
 -Tp, --tag-prefix <prefix>
@@ -283,13 +304,17 @@ 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
                       --with feat1 feat2 feat3 --without feat4 feat5 --with feat6
                       constructions. Set GROUP_BCONDS to yes to make use of it.
 --target <platform>, --target=<platform>
-		    - build for platform <platform>.
+                     - build for platform <platform>.
+--init-rpm-dir       - initialize ~/rpm directory structure
 "
 }
 
@@ -302,38 +327,48 @@ update_shell_title() {
 		echo >&2 "$(date +%s.%N) $*"
 	fi
 
-	msg="builder[$SPECFILE] ${SHELL_TITLE_PREFIX:+$SHELL_TITLE_PREFIX }$msg"
-	case "$TERM" in
-		cygwin|xterm*)
-		echo >&2 -ne "\033]1;$msg\007\033]2;$msg\007"
-	;;
-		screen*)
-		echo >&2 -ne "\033]0;$msg\007"
-	;;
-	esac
+	if [ "x$TITLECHANGE" == "xyes" -o "x$TITLECHANGE" == "x" ]; then
+		local pkg
+		if [ -n "$PACKAGE_NAME" ]; then
+			pkg=${PACKAGE_NAME}-${PACKAGE_VERSION}-${PACKAGE_RELEASE}
+		else
+			pkg=${SPECFILE}
+		fi
+
+		msg="$pkg: ${SHELL_TITLE_PREFIX:+$SHELL_TITLE_PREFIX }$msg"
+		msg="$(echo $msg | tr -d '\n\r')"
+		case "$TERM" in
+			cygwin|xterm*)
+			echo >&2 -ne "\033]1;$msg\007\033]2;$msg\007"
+		;;
+			screen*)
+			echo >&2 -ne "\033]0;$msg\007"
+		;;
+		esac
+	fi
 }
 
 # set TARGET from BuildArch: from SPECFILE
 set_spec_target() {
-	 if [ -n "$SPECFILE" ] && [ -z "$TARGET" ]; then
-		  tmp=$(awk '/^BuildArch:/ { print $NF}' $SPECFILE)
-		  if [ "$tmp" ]; then
+	if [ -n "$SPECFILE" ] && [ -z "$TARGET" ]; then
+		tmp=$(awk '/^BuildArch:/ { print $NF}' $SPECFILE)
+		if [ "$tmp" ]; then
 				TARGET="$tmp"
 				case "$RPMBUILD" in
 				"rpmbuild")
-					 TARGET_SWITCH="--target $TARGET" ;;
+					TARGET_SWITCH="--target $TARGET" ;;
 				"rpm")
-					 TARGET_SWITCH="--target=$TARGET" ;;
+					TARGET_SWITCH="--target=$TARGET" ;;
 				esac
-		  fi
-	 fi
+		fi
+	fi
 }
 
 cache_rpm_dump () {
-	 if [ -n "$DEBUG" ]; then
-		  set -x;
-		  set -v;
-	 fi
+	if [ -n "$DEBUG" ]; then
+		set -x
+		set -v
+	fi
 
 	update_shell_title "cache_rpm_dump"
 	local rpm_dump
@@ -343,20 +378,44 @@ cache_rpm_dump () {
 	# 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/.rpmmacros:~/etc/.rpmmacros:~/.rpmmacros"
+	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 > .rpmrc
+	printf 'include:/usr/lib/rpm/rpmrc\nmacrofiles:%s\n' $macrofiles > .builder-rpmrc
 # TODO: move these to /usr/lib/rpm/macros
-	cat > .rpmmacros <<'EOF'
+	cat > .builder-rpmmacros <<'EOF'
 %requires_releq_kernel_up %{nil}
 %requires_releq_kernel_smp %{nil}
+%requires_releq() %{nil}
 %pyrequires_eq() %{nil}
 %requires_eq() %{nil}
+%requires_eq_to() %{nil}
 %releq_kernel_up ERROR
 %releq_kernel_smp ERROR
 %kgcc_package ERROR
 %_fontsdir ERROR
+%ruby_version ERROR
+%ruby_ver_requires_eq() %{nil}
+%ruby_mod_ver_requires_eq() %{nil}
+%__php_api_requires() %{nil}
+%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)
@@ -366,12 +425,18 @@ EOF
 		ARGS='--nodigest --nosignature --nobuild'
 		;;
 	esac
-	$RPMBUILD --rcfile .rpmrc $ARGS --nodeps --define "prep $dump" $BCOND $TARGET_SWITCH $SPECFILE 2>&1
+	if [ "$NOINIT" = "yes" ] ; then
+		cat >> .builder-rpmmacros <<'EOF'
+%_specdir ./
+%_sourcedir ./
+EOF
+	fi
+	$RPMBUILD --rcfile .builder-rpmrc $ARGS $ARGDIRS --nodeps --define "prep $dump" $BCOND $TARGET_SWITCH $SPECFILE 2>&1
 	`
 	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
@@ -387,7 +452,7 @@ EOF
 
 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"
 }
@@ -400,19 +465,19 @@ get_icons()
 		return
 	fi
 
-	rpm_dump_cache="böö" 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
@@ -454,8 +519,8 @@ parse_spec()
 Exit_error()
 {
 	if [ -n "$DEBUG" ]; then
-		set -x;
-		set -v;
+		set -x
+		set -v
 	fi
 
 	cd "$__PWD"
@@ -463,51 +528,56 @@ 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_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
 			echo "Error: couldn't get out package name/version/release from spec file."
 			exit 6 ;;
-	   "err_tag_exists" )
+		"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" )
+		"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 ;;
 
 	esac
-   echo "Unknown error."
-   exit 100
+	echo "Unknown error."
+	exit 100
 }
 
 init_builder()
 {
 	if [ -n "$DEBUG" ]; then
-		set -x;
-		set -v;
+		set -x
+		set -v
 	fi
 
-	SOURCE_DIR="`eval $RPM $RPMOPTS --eval '%{_sourcedir}'`"
-	SPECS_DIR="`eval $RPM $RPMOPTS --eval '%{_specdir}'`"
+	if [ "$NOINIT" != "yes" ] ; then
+		SOURCE_DIR="`eval $RPM $RPMOPTS --eval '%{_sourcedir}'`"
+		SPECS_DIR="`eval $RPM $RPMOPTS --eval '%{_specdir}'`"
+	else
+		SOURCE_DIR="."
+		SPECS_DIR="."
+	fi
 
 	__PWD="`pwd`"
 }
@@ -518,13 +588,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
 
@@ -537,7 +607,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
@@ -546,24 +616,28 @@ get_spec()
 	unset OPTIONS
 	[ -n "$DONT_PRINT_REVISION" ] || grep -E -m 1 "^#.*Revision:.*Date" $SPECFILE
 
-	 set_spec_target
+	set_spec_target
 }
 
 find_mirror()
 {
 	cd "$SPECS_DIR"
-	url="$1"
+	local url="$1"
 	if [ ! -f "mirrors" -a "$NOCVSSPEC" != "yes" ] ; then
 		cvs update mirrors >&2
 	fi
 
 	IFS="|"
-	while read origin mirror name rest
-	do
+	local origin mirror name rest ol prefix
+	while read origin mirror name rest; do
+		# skip comments and empty lines
+		if [ -z "$origin" ] || [[ $origin == \#* ]]; then
+			continue
+		fi
 		ol=`echo -n "$origin"|wc -c`
 		prefix="`echo -n "$url" | head -c $ol`"
 		if [ "$prefix" = "$origin" ] ; then
-			suffix="`echo "$url"|cut -b $ol-`"
+			suffix="`echo "$url"|cut -b $((ol+1))-`"
 			echo -n "$mirror$suffix"
 			return 0
 		fi
@@ -571,6 +645,7 @@ find_mirror()
 	echo "$url"
 }
 
+# Warning: unpredictable results if same URL used twice
 src_no ()
 {
 	cd $SPECS_DIR
@@ -580,49 +655,60 @@ src_no ()
 	head -n 1 | xargs
 }
 
-src_md5 ()
+src_md5()
 {
-	[ X"$NO5" = X"yes" ] && return
+	[ "$NO5" = "yes" ] && return
 	no=$(src_no "$1")
 	[ -z "$no" ] && return
 	cd $SPECS_DIR
-	spec_rev=$(grep $SPECFILE CVS/Entries 2>/dev/null | sed -e s:/$SPECFILE/:: -e s:/.*::)
-	if [ -z "$spec_rev" ]; then
-		spec_rev="$(head -n 1 $SPECFILE | sed -e 's/.*\$Revision: \([0-9.]*\).*/\1/')"
-	fi
-	spec="$SPECFILE[0-9.,]*,$(echo $spec_rev | sed 's/\./\\./g')"
-	md5=$(grep -s -v '^#' additional-md5sums | \
-	grep -E "[ 	]$(basename "$1")[ 	]+${spec}([ 	,]|\$)" | \
-	sed -e 's/^\([0-9a-f]\{32\}\).*/\1/' | \
-	grep -E '^[0-9a-f]{32}$')
-	if [ X"$md5" = X"" ] ; then
-		source_md5=`grep -i "#[ 	]*Source$no-md5[ 	]*:" $SPECFILE | sed -e 's/.*://'`
-		if [ ! -z "$source_md5" ] ; then
-			echo $source_md5;
-		else
-			# we have empty SourceX-md5, but it is still possible
-			# that we have NoSourceX-md5 AND NoSource: X
-			nosource_md5=`grep -i "#[	 ]*NoSource$no-md5[	 ]*:" $SPECFILE | sed -e 's/.*://'`
-			if [ ! -z "$nosource_md5" -a ! X"`grep -i "^NoSource:[	 ]*$no$" $SPECFILE`" = X"" ] ; then
-				echo $nosource_md5;
-			fi;
-		fi;
+	local md5
+
+	if [ -f additional-md5sums ]; then
+		local spec_rev=$(grep $SPECFILE CVS/Entries 2>/dev/null | sed -e s:/$SPECFILE/:: -e s:/.*::)
+		if [ -z "$spec_rev" ]; then
+			spec_rev="$(head -n 1 $SPECFILE | sed -e 's/.*\$Revision: \([0-9.]*\).*/\1/')"
+		fi
+		local spec="$SPECFILE[0-9.,]*,$(echo $spec_rev | sed 's/\./\\./g')"
+		md5=$(grep -s -v '^#' additional-md5sums | \
+		grep -E "[ 	]$(basename "$1")[ 	]+${spec}([ 	,]|\$)" | \
+		sed -e 's/^\([0-9a-f]\{32\}\).*/\1/' | \
+		grep -E '^[0-9a-f]{32}$')
+
+		if [ "$md5" ]; then
+			if [ $(echo "$md5" | wc -l) != 1 ] ; then
+				echo "$SPECFILE: more then one entry in additional-md5sums for $1" 1>&2
+			fi
+			echo "$md5" | tail -n 1
+			return
+		fi
+	fi
+
+	source_md5=`grep -i "#[ 	]*Source$no-md5[ 	]*:" $SPECFILE | sed -e 's/.*://'`
+	if [ -n "$source_md5" ]; then
+		echo $source_md5
 	else
-		if [ $(echo "$md5" | wc -l) != 1 ] ; then
-			echo "$SPECFILE: more then one entry in additional-md5sums for $1" 1>&2
+		# we have empty SourceX-md5, but it is still possible
+		# that we have NoSourceX-md5 AND NoSource: X
+		nosource_md5=`grep -i "#[	 ]*NoSource$no-md5[	 ]*:" $SPECFILE | sed -e 's/.*://'`
+		if [ -n "$nosource_md5" -a -n "`grep -i "^NoSource:[	 ]*$no$" $SPECFILE`" ] ; then
+			echo $nosource_md5
 		fi
-		echo "$md5" | tail -n 1
 	fi
 }
 
+distfiles_path ()
+{
+	echo "by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")"
+}
+
 distfiles_url ()
 {
-	echo "$PROTOCOL$DISTFILES_SERVER/distfiles/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")"
+	echo "$PROTOCOL$DISTFILES_SERVER/distfiles/$(distfiles_path "$1")"
 }
 
 distfiles_attic_url ()
 {
-	echo "$PROTOCOL$ATTICDISTFILES_SERVER/distfiles/Attic/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")"
+	echo "$PROTOCOL$ATTICDISTFILES_SERVER/distfiles/Attic/$(distfiles_path "$1")"
 }
 
 good_md5 ()
@@ -634,8 +720,8 @@ good_md5 ()
 
 good_size ()
 {
-	 size="$(find $(nourl "$1") -printf "%s" 2>/dev/null)"
-	 [ -n "$size" -a "$size" -gt 0 ]
+	size="$(find $(nourl "$1") -printf "%s" 2>/dev/null)"
+	[ -n "$size" -a "$size" -gt 0 ]
 }
 
 cvsignore_df ()
@@ -651,46 +737,129 @@ cvsignore_df ()
 
 cvsup()
 {
-	 update_shell_title "cvsup"
-	 local OPTIONS="up "
-	 if [ -n "$CVSROOT" ]; then
-		  OPTIONS="-d $CVSROOT $OPTIONS"
-	 fi
-
-	 if [ -z "$CVSDATE" -a -z "$CVSTAG" ]; then
-		  OPTIONS="$OPTIONS -A"
-	 else
-		  if [ -n "$CVSDATE" ]; then
-				OPTIONS="$OPTIONS -D $CVSDATE"
-		  fi
-		  if [ -n "$CVSTAG" ]; then
-				OPTIONS="$OPTIONS -r $CVSTAG"
-		  fi
-	 fi
-
-	 local result=1
-	 local retries_counter=0
-	 if [ $# = 1 ]; then
-		 update_shell_title "cvsup: $*"
-	 else
-		 update_shell_title "cvsup: $# files"
-	 fi
-	 while [ "$result" != "0" -a "$retries_counter" -le "$CVS_RETRIES" ]; do
-		  retries_counter=$(( $retries_counter + 1 ))
-		  output=$(LC_ALL=C cvs $OPTIONS "$@" 2>&1)
-		  result=$?
-		  [ -n "$output" ] && echo "$output"
-		  if (echo "$output" | grep -qE "(Cannot connect to|connect to .* failed|Connection reset by peer|Connection timed out|Unknown host)") && [ "$result" -ne "0" -a "$retries_counter" -le "$CVS_RETRIES" ]; then
-				echo "Trying again [$*]... ($retries_counter)"
-				update_shell_title "cvsup: retry #$retries_counter"
-				sleep 2
-				continue
-		  else
-				break
-		  fi
-	 done
-	 update_shell_title "cvsup: done!"
-	 return $result
+	update_shell_title "cvsup"
+	local OPTIONS="up "
+	if [ -n "$CVSROOT" ]; then
+		OPTIONS="-d $CVSROOT $OPTIONS"
+	fi
+
+	if [ -z "$CVSDATE" -a -z "$CVSTAG" ]; then
+		OPTIONS="$OPTIONS -A"
+	else
+		if [ -n "$CVSDATE" ]; then
+			OPTIONS="$OPTIONS -D $CVSDATE"
+		fi
+		if [ -n "$CVSTAG" ]; then
+			OPTIONS="$OPTIONS -r $CVSTAG"
+		fi
+	fi
+
+	local result=1
+	local retries_counter=0
+	if [ $# = 1 ]; then
+		update_shell_title "cvsup: $*"
+	else
+		update_shell_title "cvsup: $# files"
+	fi
+	while [ "$result" != "0" -a "$retries_counter" -le "$CVS_RETRIES" ]; do
+		retries_counter=$(( $retries_counter + 1 ))
+		output=$(LC_ALL=C cvs $OPTIONS "$@" 2>&1)
+		result=$?
+		[ -n "$output" ] && echo "$output"
+		if (echo "$output" | grep -qE "(Cannot connect to|connect to .* failed|Connection reset by peer|Connection timed out|Unknown host)") && [ "$result" -ne "0" -a "$retries_counter" -le "$CVS_RETRIES" ]; then
+			echo "Trying again [$*]... ($retries_counter)"
+			update_shell_title "cvsup: retry #$retries_counter"
+			sleep 2
+			continue
+		else
+			break
+		fi
+	done
+	update_shell_title "cvsup: done!"
+	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
+		return
+	fi
+
+	update_shell_title "update md5"
+	if [ -n "$DEBUG" ]; then
+		set -x
+		set -v
+	fi
+
+	cd "$SOURCE_DIR"
+
+	# pass 1: check files to be fetched
+	local todo
+	local need_files
+	for i in "$@"; do
+		local fp=$(nourl "$i")
+		local srcno=$(src_no "$i")
+		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"
+		fi
+	done
+
+	# pass 1a: get needed files
+	if [ "$need_files" ]; then
+		get_files $need_files
+	fi
+
+	# pass 2: proceed with md5 adding or updating
+	for i in "$@"; do
+		local fp=$(nourl "$i")
+		local srcno=$(src_no "$i")
+		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*(No)?Source'$srcno'-md5\s*:/i;
+				print "# '$tag':\t'$md5'\n" if /^Source'$srcno'\s*:\s+/;
+			' \
+			$SPECS_DIR/$SPECFILE
+		fi
+	done
+}
+
+check_md5()
+{
+	update_shell_title "check md5"
+
+	for i in "$@"; do
+		if good_md5 "$i" && good_size "$i"; then
+			continue
+		fi
+
+		echo "MD5 sum mismatch or 0 size.  Use -U to refetch sources,"
+		echo "or -5 to update md5 sums, if you're sure files are correct."
+		Exit_error err_no_source_in_repo $i
+	done
 }
 
 get_files()
@@ -698,8 +867,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
@@ -718,33 +887,42 @@ get_files()
 			SHELL_TITLE_PREFIX="get_files[$nc/$#]"
 			update_shell_title "$i"
 			local fp=`nourl "$i"`
-			if [ -f "$fp" ] && [ "$SKIP_EXISTING_FILES" = "yes" ]; then
-				 continue
-			fi
-			if [ -n "$UPDATE5" ]; then
-				if [ -n "$ADD5" ]; then
-					[ "$fp" = "$i" ] && continue
-					grep -qiE '^#[ 	]*Source'$(src_no $i)'-md5[ 	]*:' $SPECS_DIR/$SPECFILE && continue
-				else
-					grep -qiE '^#[ 	]*Source'$(src_no $i)'-md5[ 	]*:' $SPECS_DIR/$SPECFILE || continue
-				fi
+			if [ "$SKIP_EXISTING_FILES" = "yes" ] && [ -f "$fp" ]; then
+				continue
 			fi
+
 			FROM_DISTFILES=0
+			local srcmd5=$(src_md5 "$i")
+
+			# we know if source/patch is present in cvs/distfiles
+			# - has md5 (in distfiles)
+			# - in cvs... ideas?
+
+			# CHECK: local file didn't exist or always cvs up (first) requested.
 			if [ ! -f "$fp" ] || [ $ALWAYS_CVSUP = "yes" ]; then
 				if echo $i | grep -vE '(http|ftp|https|cvs|svn)://' | grep -qE '\.(gz|bz2)$']; then
 					echo "Warning: no URL given for $i"
 				fi
 
-				if [ -z "$NODIST" ] && [ -n "$(src_md5 "$i")" ]; then
+				if [ -z "$NODIST" ] && [ -n "$srcmd5" ]; then
 					if good_md5 "$i" && good_size "$i"; then
-						echo "$(nourl "$i") having proper md5sum already exists"
+						echo "$fp having proper md5sum already exists"
 						continue
 					fi
 					target="$fp"
-					url=$(distfiles_url "$i")
+
+					# prefer mirror over distfiles if there's mirror
+					# TODO: build url list and then try each url from the list
+					if [ -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
-					if [ "`echo $url | grep -E '^(\.|/)'`" ]; then
+					# is $url local file?
+					if [[ "$url" = [./]* ]]; then
 						update_shell_title "${GETLOCAL%% *}: $url"
 						${GETLOCAL} $url $target
 					else
@@ -758,7 +936,9 @@ get_files()
 							${GETURI2} ${OUTFILEOPT} "$target" "$url"
 						fi
 					fi
-					if ! test -s "$target"; then
+
+					# is it empty file?
+					if [ ! -s "$target" ]; then
 						rm -f "$target"
 						if [ `echo $url_attic | grep -E '^(\.|/)'` ]; then
 							update_shell_title "${GETLOCAL%% *}: $url_attic"
@@ -770,18 +950,19 @@ get_files()
 							update_shell_title "${GETURI%% *}: $url_attic"
 							${GETURI} ${OUTFILEOPT} "$target" "$url_attic" || \
 							if [ "`echo $url_attic | grep -E 'ftp://'`" ]; then
-								 update_shell_title "${GETURI2%% *}: $url_attic"
+								update_shell_title "${GETURI2%% *}: $url_attic"
 								${GETURI2} ${OUTFILEOPT} "$target" "$url_attic"
 							fi
 						fi
 					fi
-					if test -s "$target"; then
+
+					if [ -s "$target" ]; then
 						cvsignore_df $target
 					else
 						rm -f "$target"
 						FROM_DISTFILES=0
 					fi
-				elif [ "$NOCVS" != "yes" -a -z "$(src_md5 "$i")" ]; then
+				elif [ "$NOCVS" != "yes" -a -z "$srcmd5" ]; then
 					if [ $# -gt 1 ]; then
 						get_files_cvs="$get_files_cvs $fp"
 						update_shell_title "$fp (will cvs up later)"
@@ -797,10 +978,10 @@ get_files()
 					else
 						im="$i"
 					fi
-				 	update_shell_title "${GETURI%% *}: $im"
+					update_shell_title "${GETURI%% *}: $im"
 					${GETURI} "$im" || \
 					if [ "`echo $im | grep -E 'ftp://'`" ]; then
-						 update_shell_title "${GETURI2%% *}: $im"
+						update_shell_title "${GETURI2%% *}: $im"
 						${GETURI2} "$im"
 					fi
 				fi
@@ -810,24 +991,13 @@ get_files()
 				fi
 
 			fi
-			srcno=$(src_no $i)
+
+			# 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;
-			elif [ -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'$(src_no $i)'-md5[ 	]*:' $SPECS_DIR/$SPECFILE )
-			then
-				echo "Updating source-$srcno md5."
-				md5=$(md5sum "$fp" | cut -f1 -d' ')
-				perl -i -ne '
-				print unless /^\s*#\s*Source'$srcno'-md5\s*:/i;
-				print "# Source'$srcno'-md5:\t'$md5'\n"
-				if /^Source'$srcno'\s*:\s+/;
-				' \
-				$SPECS_DIR/$SPECFILE
+				Exit_error err_no_source_in_repo $i
 			fi
 
+			# we check md5 here just only to refetch immediately
 			if good_md5 "$i" && good_size "$i"; then
 				:
 			elif [ "$FROM_DISTFILES" = 1 ]; then
@@ -839,33 +1009,25 @@ get_files()
 				update_shell_title "${GETURI%% *}: $url"
 				${GETURI} ${OUTFILEOPT} "$target" "$url" || \
 				if [ "`echo $url | grep -E 'ftp://'`" ]; then
-					 update_shell_title "${GETURI2%% *}: $url"
+					update_shell_title "${GETURI2%% *}: $url"
 					${GETURI2} ${OUTFILEOPT} "$target" "$url"
 				fi
-				if ! test -s "$target"; then
+				if [ ! -s "$target" ]; then
 					rm -f "$target"
 					update_shell_title "${GETURI%% *}: $url_attic"
 					${GETURI} ${OUTFILEOPT} "$target" "$url_attic" || \
 					if [ "`echo $url_attic | grep -E 'ftp://'`" ]; then
-						 update_shell_title "${GETURI2%% *}: $url_attic"
+						update_shell_title "${GETURI2%% *}: $url_attic"
 						${GETURI2} ${OUTFILEOPT} "$target" "$url_attic"
 					fi
 				fi
 				test -s "$target" || rm -f "$target"
 			fi
-
-			if good_md5 "$i" && good_size "$i" ; then
-				:
-			else
-				echo "MD5 sum mismatch or 0 size.  Use -U to refetch sources,"
-				echo "or -5 to update md5 sums, if you're sure files are correct."
-				Exit_error err_no_source_in_repo $i
-			fi
 		done
 		SHELL_TITLE_PREFIX=""
 
 		if [ "$get_files_cvs" ]; then
-			 cvsup $get_files_cvs
+			cvsup $get_files_cvs
 		fi
 
 		if [ "$CHMOD" = "yes" ]; then
@@ -878,21 +1040,20 @@ get_files()
 }
 
 make_tagver() {
+	if [ -n "$DEBUG" ]; then
+		set -x
+		set -v
+	fi
 
-		if [ -n "$DEBUG" ]; then
-			 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"`
-		# 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')
-		echo -n "$TAGVER"
+	# 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"`
+	# 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')
+	echo -n "$TAGVER"
 }
 
 tag_files()
@@ -900,54 +1061,59 @@ tag_files()
 	TAG_FILES="$@"
 
 	if [ -n "$DEBUG" ]; then
-		set -x;
-		set -v;
+		set -x
+		set -v
 	fi
 
-	if [ -n "$1$2$3$4$5$6$7$8$9${10}" ]; then
-		echo "Version: $PACKAGE_VERSION"
-		echo "Release: $PACKAGE_RELEASE"
+	echo "Version: $PACKAGE_VERSION"
+	echo "Release: $PACKAGE_RELEASE"
 
-		TAGVER=`make_tagver`
+	TAGVER=`make_tagver`
 
-		if [ "$TAG_VERSION" = "yes" ]; then
-			echo "CVS tag: $TAGVER"
-		fi
-		if [ -n "$TAG" ]; then
-			echo "CVS tag: $TAG"
-		fi
+	if [ "$TAG_VERSION" = "yes" ]; then
+		echo "CVS tag: $TAGVER"
+	fi
+	if [ -n "$TAG" ]; then
+		echo "CVS tag: $TAG"
+	fi
 
-		OPTIONS="tag -F"
-		if [ -n "$CVSROOT" ]; then
-			OPTIONS="-d $CVSROOT $OPTIONS"
-		fi
+	local OPTIONS="tag $CVS_FORCE"
+	if [ -n "$CVSROOT" ]; then
+		OPTIONS="-d $CVSROOT $OPTIONS"
+	fi
 
-		cd "$SOURCE_DIR"
-		for i in $TAG_FILES
-		do
-			# don't tag files stored on distfiles
-			[ -n "`src_md5 $i`" ] && continue
-			if [ -f "`nourl $i`" ]; then
-				if [ "$TAG_VERSION" = "yes" ]; then
-					cvs $OPTIONS $TAGVER `nourl $i`
-				fi
-				if [ -n "$TAG" ]; then
-					cvs $OPTIONS $TAG `nourl $i`
-				fi
-			else
-				Exit_error err_no_source_in_repo $i
-			fi
-		done
+	cd "$SOURCE_DIR"
+	local tag_files
+	for i in $TAG_FILES; do
+		# don't tag files stored on distfiles
+		[ -n "`src_md5 $i`" ] && continue
+		local fp=`nourl "$i"`
+		if [ -f "$fp" ]; then
+			tag_files="$tag_files $fp"
+		else
+			Exit_error err_no_source_in_repo $i
+		fi
+	done
 
-		cd "$SPECS_DIR"
+	if [ "$tag_files" ]; then
 		if [ "$TAG_VERSION" = "yes" ]; then
-			cvs $OPTIONS $TAGVER $SPECFILE
+			update_shell_title "tag sources: $TAGVER"
+			cvs $OPTIONS $TAGVER $tag_files
 		fi
 		if [ -n "$TAG" ]; then
-			cvs $OPTIONS $TAG $SPECFILE
+			update_shell_title "tag sources: $TAG"
+			cvs $OPTIONS $TAG $tag_files
 		fi
+	fi
 
-		unset OPTIONS
+	cd "$SPECS_DIR"
+	if [ "$TAG_VERSION" = "yes" ]; then
+		update_shell_title "tag spec: $TAGVER"
+		cvs $OPTIONS $TAGVER $SPECFILE
+	fi
+	if [ -n "$TAG" ]; then
+		update_shell_title "tag spec: $TAG"
+		cvs $OPTIONS $TAG $SPECFILE
 	fi
 }
 
@@ -955,35 +1121,35 @@ 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
 
-	if [ -n "$1$2$3$4$5$6$7$8$9${10}" ]; then
-
-		OPTIONS="tag -b"
-		if [ -n "$CVSROOT" ]; then
-			OPTIONS="-d $CVSROOT $OPTIONS"
+	local OPTIONS="tag $CVS_FORCE -b"
+	if [ -n "$CVSROOT" ]; then
+		OPTIONS="-d $CVSROOT $OPTIONS"
+	fi
+	cd "$SOURCE_DIR"
+	local tag_files
+	for i in $TAG_FILES; do
+		local fp=`nourl "$i"`
+		if [ -f "$fp" ]; then
+			tag_files="$tag_files $fp"
+		else
+			Exit_error err_no_source_in_repo $i
 		fi
-		cd "$SOURCE_DIR"
-		for i in $TAG_FILES
-		do
-			if [ -f `nourl $i` ]; then
-				cvs $OPTIONS $TAG `nourl $i`
-			else
-				Exit_error err_no_source_in_repo $i
-			fi
-		done
-		cd "$SPECS_DIR"
-		cvs $OPTIONS $TAG $SPECFILE
-
-		unset OPTIONS
+	done
+	if [ "$tag_files" ]; then
+		cvs $OPTIONS $TAG $tag_files
 	fi
+
+	cd "$SPECS_DIR"
+	cvs $OPTIONS $TAG $SPECFILE
 }
 
 
@@ -992,14 +1158,14 @@ build_package()
 {
 	update_shell_title "build_package"
 	if [ -n "$DEBUG" ]; then
-		set -x;
-		set -v;
+		set -x
+		set -v
 	fi
 
 	cd "$SPECS_DIR"
 
 	if [ -n "$TRY_UPGRADE" ]; then
-		  update_shell_title "build_package: try_upgrade"
+		update_shell_title "build_package: try_upgrade"
 		if [ -n "$FLOAT_VERSION" ]; then
 			TNOTIFY=`./pldnotify.awk $SPECFILE -n` || exit 1
 		else
@@ -1011,12 +1177,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
@@ -1031,6 +1201,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"
@@ -1039,13 +1216,13 @@ 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
 		fi
 		RES_FILE=~/tmp/$RPMBUILD-exit-status.$RANDOM
-		(time eval nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $TARGET_SWITCH $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
+		(time eval ${NICE_COMMAND} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND $TARGET_SWITCH $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
 		RETVAL=`cat $RES_FILE`
 		rm $RES_FILE
 		if [ -n "$LOGDIROK" ] && [ -n "$LOGDIRFAIL" ]; then
@@ -1056,15 +1233,17 @@ build_package()
 			fi
 		fi
 	else
-		eval nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $TARGET_SWITCH $SPECFILE
+		eval ${NICE_COMMAND} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND $TARGET_SWITCH $SPECFILE
 		RETVAL=$?
 	fi
 	if [ "$RETVAL" -ne "0" ]; then
 		if [ -n "$TRY_UPGRADE" ]; then
-			echo "\n!!! Package with new version cannot be build automagically\n"
-			mv -f $SPECFILE.bak $SPECFILE
+			echo "\n!!! Package with new version cannot be built automagically\n"
+			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
 }
@@ -1098,22 +1277,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:
 	# ---
@@ -1123,34 +1287,62 @@ set_bconds_values()
 	# php +mysqli
 	# ---
 	if ([ -f $HOME/.bcondrc ] || ([ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ])); then
-		SN=${SPECFILE%%\.spec}
+		:
+	else
+		return
+	fi
 
-		local bcondrc=$HOME/.bcondrc
-		[ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ] && bcondrc=$HOME_ETC/.bcondrc
+	SN=${SPECFILE%%\.spec}
 
-		while read pkg flags; do
-			# ignore comments
-			[[ "$pkg" == \#* ]] && continue
+	local bcondrc=$HOME/.bcondrc
+	[ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ] && bcondrc=$HOME_ETC/.bcondrc
 
-			# any package or current package?
-			if [ "$pkg" = "*" ] || [ "$pkg" = "$PACKAGE_NAME" ] || [ "$pkg" = "$SN" ]; then
-				for flag in $flags; do
-					local opt=${flag#[+-]}
+	local bcond_avail=$(find_spec_bcond $SPECFILE)
 
-					# use only flags which are in this package.
-					if [[ $bcond_avail = *${opt}* ]]; then
-						if [[ $flag = -* ]]; then
+	while read pkg flags; do
+		# ignore comments
+		[[ "$pkg" == \#* ]] && continue
+
+		# 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"
-						else
+						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)
@@ -1270,24 +1462,24 @@ run_sub_builder()
 
 spawn_sub_builder()
 {
-	 package_name="${1}"
-	 update_shell_title "spawn_sub_builder $package_name"
-
-	 sub_builder_opts=''
-	 if [ "${FETCH_BUILD_REQUIRES}" == "yes" ]; then
-		  sub_builder_opts="${sub_builder_opts} -R"
-	 fi
-	 if [ "${REMOVE_BUILD_REQUIRES}" == "nice" ]; then
-		  sub_builder_opts="${sub_builder_opts} -RB"
-	 elif [ "${REMOVE_BUILD_REQUIRES}" == "force" ]; then
-		  sub_builder_opts="${sub_builder_opts} -FRB"
-	 fi
-	 if [ "${UPDATE_POLDEK_INDEXES}" == "yes" ]; then
-		  sub_builder_opts="${sub_builder_opts} -Upi"
-	 fi
-
-	 cd "${SPECS_DIR}"
-	 ./builder ${sub_builder_opts} "$@"
+	package_name="${1}"
+	update_shell_title "spawn_sub_builder $package_name"
+
+	sub_builder_opts=''
+	if [ "${FETCH_BUILD_REQUIRES}" == "yes" ]; then
+		sub_builder_opts="${sub_builder_opts} -R"
+	fi
+	if [ "${REMOVE_BUILD_REQUIRES}" == "nice" ]; then
+		sub_builder_opts="${sub_builder_opts} -RB"
+	elif [ "${REMOVE_BUILD_REQUIRES}" == "force" ]; then
+		sub_builder_opts="${sub_builder_opts} -FRB"
+	fi
+	if [ "${UPDATE_POLDEK_INDEXES}" == "yes" ]; then
+		sub_builder_opts="${sub_builder_opts} -Upi"
+	fi
+
+	cd "${SPECS_DIR}"
+	./builder ${sub_builder_opts} "$@"
 }
 
 remove_build_requires()
@@ -1325,10 +1517,10 @@ display_bconds()
 
 display_branches()
 {
-	 if [ "$NOCVSSPEC" != "yes" ]; then
-		  echo -ne "Available branches: "
-		  cvs status -v "${SPECFILE}" | awk '!/Sticky Tag:/ && /\(branch:/ { print $1 } ' | xargs
-	 fi
+	if [ "$NOCVSSPEC" != "yes" ]; then
+		echo -ne "Available branches: "
+		cvs status -v "${SPECFILE}" | awk '!/Sticky Tag:/ && /\(branch:/ { print $1 } ' | xargs
+	fi
 }
 
 # checks a given list of packages/files/provides agains current rpmdb.
@@ -1336,21 +1528,21 @@ display_branches()
 # input can be either STDIN or parameters
 _rpm_prov_check()
 {
-	 local DEPS
+	local DEPS
 
-	 if [ "$#" -gt 0 ]; then
-		  DEPS="$@"
-	 else
-		  DEPS=$(cat)
-	 fi
+	if [ "$#" -gt 0 ]; then
+		DEPS="$@"
+	else
+		DEPS=$(cat)
+	fi
 
-	 DEPS=$(rpm -q --whatprovides $DEPS 2>&1 | awk '/^(error:|no package provides)/ { print }')
+	DEPS=$(rpm -q --whatprovides $DEPS 2>&1 | awk '/^(error:|no package provides)/ { print }')
 
-	 # packages
-	 echo "$DEPS" | awk '/^no package provides/ { print $NF }'
+	# packages
+	echo "$DEPS" | awk '/^no package provides/ { print $NF }'
 
-	 # other deps (files)
-	 echo "$DEPS" | awk -F: '/^error:.*No such file/{o = $2; gsub("^ file ", "", o); print o}'
+	# other deps (files)
+	echo "$DEPS" | awk -F: '/^error:.*No such file/{o = $2; gsub("^ file ", "", o); print o}'
 }
 
 # checks if given package/files/provides exists in rpmdb.
@@ -1358,15 +1550,15 @@ _rpm_prov_check()
 # returns packages wchi hare present in the rpmdb
 _rpm_cnfl_check()
 {
-	 local DEPS
+	local DEPS
 
-	 if [ "$#" -gt 0 ]; then
-		  DEPS="$@"
-	 else
-		  DEPS=$(cat)
-	 fi
+	if [ "$#" -gt 0 ]; then
+		DEPS="$@"
+	else
+		DEPS=$(cat)
+	fi
 
-	 rpm -q --whatprovides $DEPS 2>/dev/null | awk '!/no package provides/ { print }'
+	rpm -q --whatprovides $DEPS 2>/dev/null | awk '!/no package provides/ { print }'
 }
 
 fetch_build_requires()
@@ -1387,7 +1579,7 @@ fetch_build_requires()
 				$SU_SUDO /usr/bin/poldek --noask --nofollow -ev $CONF
 			fi
 
-		   while [ "$DEPS" ]; do
+		while [ "$DEPS" ]; do
 				update_shell_title "install deps: $DEPS"
 				echo "Trying to install dependencies ($DEPS):"
 				local log=.${SPECFILE}_poldek.log
@@ -1396,15 +1588,15 @@ fetch_build_requires()
 				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"
+					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=""
+					DEPS=""
 				fi
-		   done
+		done
 			return
 		fi
 
@@ -1486,11 +1678,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)
@@ -1502,7 +1694,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"
@@ -1522,7 +1714,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"
@@ -1551,29 +1743,47 @@ fetch_build_requires()
 	fi
 }
 
+init_rpm_dir() {
+
+	TOP_DIR="`eval $RPM $RPMOPTS --eval '%{_topdir}'`"
+	CVSROOT=":pserver:cvs@$CVS_SERVER:/cvsroot"
+
+	mkdir -p $TOP_DIR/{RPMS,BUILD,SRPMS}
+	cd $TOP_DIR
+	cvs -d $CVSROOT co SOURCES/.cvsignore SPECS/{mirrors,adapter{,.awk},fetchsrc_request,builder,{relup,repackage}.sh}
+
+	init_builder
+
+	echo "To checkout *all* .spec files:"
+	echo "- remove $SPECS_DIR/CVS/Entries.Static"
+	echo "- run cvs up in $SPECS_DIR dir"
+
+	echo ""
+	echo "To commit with your developer account:"
+	echo "- edit $SPECS_DIR/CVS/Root"
+	echo "- edit $SOURCE_DIR/CVS/Root"
+}
+
 #---------------------------------------------
 # 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="get";
+		-5 | --update-md5)
+			COMMAND="update_md5"
 			NODIST="yes"
 			NOCVSSPEC="yes"
-			UPDATE5="yes"
 			shift ;;
 		-a5 | --add-md5 )
-			COMMAND="get";
+			COMMAND="update_md5"
 			NODIST="yes"
 			NOCVS="yes"
 			NOCVSSPEC="yes"
-			UPDATE5="yes"
 			ADD5="yes"
 			shift ;;
 		-n5 | --no-md5 )
@@ -1589,14 +1799,22 @@ do
 			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 )
 			CLEAN="--clean --rmspec --rmsource"; shift ;;
+		-cf | --cvs-force )
+			CVS_FORCE="-F"; shift;;
 		-d | --cvsroot )
 			shift; CVSROOT="${1}"; shift ;;
 		-g | --get )
@@ -1636,8 +1854,11 @@ do
 			NOSRCS="yes"
 			ALWAYS_CVSUP="no"
 			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 )
@@ -1652,11 +1873,11 @@ do
 					done;;
 				"no")
 					if [[ "$2" = *,* ]]; then
-						 for a in $(echo "$2" | tr , ' '); do
-							  BCOND="$BCOND $1 $a"
-						 done
+						for a in $(echo "$2" | tr , ' '); do
+							BCOND="$BCOND $1 $a"
+						done
 					else
-						 BCOND="$BCOND $1 $2"
+						BCOND="$BCOND $1 $2"
 					fi
 					shift 2 ;;
 			esac
@@ -1671,6 +1892,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=
@@ -1681,6 +1904,12 @@ do
 		-FRB | --force-remove-build-requires)
 			REMOVE_BUILD_REQUIRES="force"
 			shift ;;
+		-sd | --sources-distfiles)
+			COMMAND="list-sources-distfiles"
+			shift ;;
+		-sdp | --sources-distfiles-paths)
+			COMMAND="list-sources-distfiles-paths"
+			shift ;;
 		-sf | --sources-files)
 			COMMAND="list-sources-files"
 			shift ;;
@@ -1691,27 +1920,17 @@ do
 			COMMAND="list-sources-urls"
 			shift ;;
 		-Tvs | --tag-version-stable )
-			COMMAND="tag";
+			COMMAND="tag"
 			TAG="STABLE"
 			TAG_VERSION="yes"
 			shift;;
-		-Tvn | --tag-version-nest )
-			COMMAND="tag";
-			TAG="NEST"
-			TAG_VERSION="yes"
-			shift;;
 		-Ts | --tag-stable )
-			COMMAND="tag";
+			COMMAND="tag"
 			TAG="STABLE"
 			TAG_VERSION="no"
 			shift;;
-		-Tn | --tag-nest )
-			COMMAND="tag";
-			TAG="NEST"
-			TAG_VERSION="no"
-			shift;;
 		-Tv | --tag-version )
-			COMMAND="tag";
+			COMMAND="tag"
 			TAG=""
 			TAG_VERSION="yes"
 			shift;;
@@ -1722,7 +1941,7 @@ do
 			TEST_TAG="yes"
 			shift;;
 		-T | --tag )
-			COMMAND="tag";
+			COMMAND="tag"
 			shift
 			TAG="$1"
 			TAG_VERSION="no"
@@ -1731,15 +1950,17 @@ do
 			INTEGER_RELEASE="yes"
 			shift;;
 		-U | --update )
-			COMMAND="get"
+			COMMAND="update_md5"
 			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"
+			shift ;;
 		-u | --try-upgrade )
 			TRY_UPGRADE="1"; shift ;;
 		-un | --try-upgrade-with-float-version )
@@ -1749,12 +1970,25 @@ do
 		--define)
 			shift
 			MACRO="${1}"
-			VALUE="${2}"
-			shift 2
-			RPMOPTS="${RPMOPTS} --define \"${MACRO} ${VALUE}\""
+			shift
+			if echo "${MACRO}" | grep -q '\W'; then
+				RPMOPTS="${RPMOPTS} --define \"${MACRO}\""
+			else
+				VALUE="${1}"
+				shift
+				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)
@@ -1762,21 +1996,31 @@ do
 			RPMOPTS="${RPMOPTS} --nodeps"
 			;;
 		-debug)
-			RPMOPTS="${RPMOPTS} -debug"; shift ;;
+			RPMBUILDOPTS="${RPMBUILDOPTS} -debug"; shift ;;
 		* )
 			SPECFILE="${1}"
 			# check if specname was passed as specname:cvstag
 			if [ "${SPECFILE##*:}" != "${SPECFILE}" ]; then
-				CVSTAG="${SPECFILE##*:}";
-				SPECFILE="${SPECFILE%%:*}";
+				CVSTAG="${SPECFILE##*:}"
+				SPECFILE="${SPECFILE%%:*}"
 			fi
-			shift ;;
+			shift
 	esac
 done
 
+if [ -z "$CVSTAG" ]; then
+	CVSTAG=$(awk -vSPECFILE="${SPECFILE%.spec}.spec" -F/ '$2 == SPECFILE && $6 ~ /^T/{print substr($6, 2)}' CVS/Entries)
+	if [ "$CVSTAG" ]; then
+		echo >&2 "builder: Stick tag $CVSTAG active. Use -r TAGNAME to override."
+	fi
+elif [ "$CVSTAG" = "HEAD" ]; then
+	# assume -r HEAD is same as -A
+	CVSTAG=""
+fi
+
 if [ -n "$DEBUG" ]; then
-	set -x;
-	set -v;
+	set -x
+	set -v
 fi
 
 if [ -n "$TARGET" ]; then
@@ -1788,18 +2032,41 @@ if [ -n "$TARGET" ]; then
 	esac
 fi
 
+if [ "$SCHEDTOOL" != "no" ]; then
+	NICE_COMMAND="$SCHEDTOOL"
+else
+	NICE_COMMAND="nice -n ${DEF_NICE_LEVEL}"
+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;
-			parse_spec;
-			set_bconds_values;
-			display_bconds;
-			display_branches;
-			[ X"$SHOW_BCONDS" = X"yes" ] && exit 0
-			fetch_build_requires;
+			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
+			fetch_build_requires
 			if [ "$INTEGER_RELEASE" = "yes" ]; then
 				echo "Checking release $PACKAGE_RELEASE..."
 				if echo $PACKAGE_RELEASE | grep -q '^[^.]*\.[^.]*$' 2>/dev/null ; then
@@ -1818,73 +2085,96 @@ case "$COMMAND" in
 				# - do not allow to build from HEAD when XX-branch exists
 				TREE_PREFIX=$(echo "$TAG_PREFIX" | sed -e 's#^auto-\([a-zA-Z]\+\)-.*#\1#g')
 				if [ "$TREE_PREFIX" != "$TAG_PREFIX" ]; then
-					 TAG_BRANCH="${TREE_PREFIX}-branch"
-					 TAG_STATUS=$(cvs status -v $SPECFILE | grep -Ei "${TAG_BRANCH}.+(branch: [0-9.]+)")
-					 if [ -n "$TAG_STATUS" -a "$CVSTAG" = "HEAD" ]; then
-						  Exit_error err_branch_exists "$TAG_STATUS"
-					 fi
-
+					TAG_BRANCH="${TREE_PREFIX}-branch"
+					TAG_STATUS=$(cvs status -v $SPECFILE | grep -Ei "${TAG_BRANCH}.+(branch: [0-9.]+)")
+					if [ -n "$TAG_STATUS" -a "$CVSTAG" = "HEAD" ]; then
+						Exit_error err_branch_exists "$TAG_STATUS"
+					fi
 				fi
 			fi
 
 			if [ -n "$NOSOURCE0" ] ; then
 				SOURCES=`echo $SOURCES | xargs | sed -e 's/[^ ]*//'`
 			fi
-			get_files $SOURCES $PATCHES;
-			build_package;
+			get_files $SOURCES $PATCHES
+			check_md5 $SOURCES
+			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_files $SOURCES $PATCHES;
-			branch_files $TAG "$SOURCES $PATCHES $ICONS";
+			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
 				SOURCES=`echo $SOURCES | xargs | sed -e 's/[^ ]*//'`
 			fi
 			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
+		if [ -n "$SPECFILE" ]; then
+			get_spec
+			parse_spec
+
+			if [ -n "$NOSOURCE0" ] ; then
+				SOURCES=`echo $SOURCES | xargs | sed -e 's/[^ ]*//'`
+			fi
+			update_md5 $SOURCES
+		else
+			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=""
-			for file in $SOURCES
-			do
+			for file in $SOURCES; do
 				[ -n "`src_md5 $file`" ] && continue
 				new_SOURCES="$new_SOURCES $file"
 			done
 			SOURCES="$new_SOURCES"
-			get_files $SOURCES $PATCHES;
-			tag_files "$SOURCES $PATCHES $ICONS";
+			get_files $SOURCES $PATCHES
+			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" )
@@ -1896,9 +2186,8 @@ case "$COMMAND" in
 		DONT_PRINT_REVISION="yes"
 		get_spec
 		parse_spec
-		SAPS="$SOURCES $PATCHES"
-		for SAP in $SAPS ; do
-			 echo $SAP | awk '{gsub(/.*\//,"") ; print}'
+		for SAP in $SOURCES $PATCHES; do
+			echo $SAP | awk '{gsub(/.*\//,"") ; print}'
 		done
 		;;
 	"list-sources-urls" )
@@ -1909,7 +2198,7 @@ case "$COMMAND" in
 		parse_spec
 		SAPS="$SOURCES $PATCHES"
 		for SAP in $SAPS ; do
-			 echo $SAP
+			echo $SAP
 		done
 		;;
 	"list-sources-local-paths" )
@@ -1918,11 +2207,37 @@ case "$COMMAND" in
 		DONT_PRINT_REVISION="yes"
 		get_spec
 		parse_spec
-		SAPS="$SOURCES $PATCHES"
-		for SAP in $SAPS ; do
-			 echo $SOURCE_DIR/$(echo $SAP | awk '{gsub(/.*\//,"") ; print }')
+		for SAP in $SOURCES $PATCHES; do
+			echo $SOURCE_DIR/$(echo $SAP | awk '{gsub(/.*\//,"") ; print }')
+		done
+		;;
+	"list-sources-distfiles-paths" )
+		init_builder
+		NOCVSSPEC="yes"
+		DONT_PRINT_REVISION="yes"
+		get_spec
+		parse_spec
+		for SAP in $SOURCES $PATCHES; do
+			if [ -n "$(src_md5 "$SAP")" ]; then
+				distfiles_path "$SAP"
+			fi
 		done
 		;;
+	"list-sources-distfiles" )
+		init_builder
+		NOCVSSPEC="yes"
+		DONT_PRINT_REVISION="yes"
+		get_spec
+		parse_spec
+		for SAP in $SOURCES $PATCHES; do
+			if [ -n "$(src_md5 "$SAP")" ]; then
+				distfiles_url "$SAP"
+			fi
+		done
+		;;
+	"init_rpm_dir")
+		init_rpm_dir
+		;;
 	"usage" )
 		usage;;
 	"version" )
@@ -1933,4 +2248,4 @@ if [ -f "`pwd`/.${SPECFILE}_INSTALLED_PACKAGES" -a "$REMOVE_BUILD_REQUIRES" != "
 fi
 cd "$__PWD"
 
-# vi:syntax=sh:ts=4:sw=4
+# vi:syntax=sh:ts=4:sw=4:noet