X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=builder.sh;h=58e90656872e663fd5d82079db481a6693df20e9;hb=80222d62805027b5ce6b79151b9b6a03df846d9b;hp=ad79b597accaefc3cafdc801e04a55bbd6843236;hpb=cb799868be501a3118d0a67d61e510d71f351feb;p=packages%2Frpm-build-tools.git

diff --git a/builder.sh b/builder.sh
index ad79b59..58e9065 100644
--- a/builder.sh
+++ b/builder.sh
@@ -22,7 +22,7 @@
 
 VERSION="\
 Build package utility from PLD Linux CVS repository
-V 0.13 (C) 1999-2005 Free Penguins".
+v0.16 (C) 1999-2006 Free Penguins".
 PATH="/bin:/usr/bin:/usr/sbin:/sbin:/usr/X11R6/bin"
 
 COMMAND="build"
@@ -37,6 +37,7 @@ NOURLS=""
 NOCVS=""
 NOCVSSPEC=""
 NODIST=""
+NOINIT=""
 UPDATE=""
 UPDATE5=""
 ADD5=""
@@ -61,6 +62,7 @@ LASTLOG_FILE=""
 CHMOD="no"
 CHMOD_MODE="0444"
 RPMOPTS=""
+RPMBUILDOPTS=""
 BCOND=""
 GROUP_BCONDS="no"
 CVSIGNORE_DF="no"
@@ -77,22 +79,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 +119,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 +130,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 +147,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 +177,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 +194,14 @@ 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]
+[{-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] [-Tvn|--tag-version-nest]
-[-Ts|--tag-stable] [-Tn|--tag-nest] [-Tv|--tag-version]
+[-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]
+[--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
@@ -209,6 +223,7 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--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 +246,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
@@ -246,24 +262,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>
@@ -289,7 +308,8 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
                       --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
 "
 }
 
@@ -298,57 +318,136 @@ update_shell_title() {
 	local len=${COLUMNS:-80}
 	local msg=$(echo "$*" | cut -c-$len)
 
-	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 [ -n "$BE_VERBOSE" ]; then
+		echo >&2 "$(date +%s.%N) $*"
+	fi
+
+	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
 
-rpm_dump_cache=`
+	update_shell_title "cache_rpm_dump"
+	local rpm_dump
+	rpm_dump=`
+
+	# 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'
+%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
+EOF
 	case "$RPMBUILD" in
-		rpm )
-			rpm -bp --nodeps --define 'prep %dump' $BCOND $TARGET_SWITCH $SPECFILE 2>&1
-			;;
-		rpmbuild )
-			rpmbuild --nodigest --nosignature --define 'prep %dump' $BCOND $TARGET_SWITCH $SPECFILE 2>&1
-			;;
-	esac`
+	rpm)
+		ARGS='-bp'
+		;;
+	rpmbuild)
+		ARGS='--nodigest --nosignature --nobuild'
+		;;
+	esac
+	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;
+	fi
+
+	# make small dump cache
+	rpm_dump_cache=`echo "$rpm_dump" | awk '
+		$2 ~ /^SOURCEURL/ {print}
+		$2 ~ /^PATCHURL/  {print}
+		$2 ~ /^nosource/ {print}
+		$2 ~ /^PACKAGE_/ {print}
+	'`
+
+	update_shell_title "cache_rpm_dump: OK!"
 }
 
 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"
 }
 
+get_icons()
+{
+	update_shell_title "get icons"
+	ICONS="`awk '/^Icon:/ {print $2}' ${SPECFILE}`"
+	if [ -z "$ICONS" ]; then
+		return
+	fi
+
+	rpm_dump_cache="kalasaba" NODIST="yes" get_files $ICONS
+}
+
 parse_spec()
 {
 	update_shell_title "parsing specfile"
@@ -357,29 +456,25 @@ parse_spec()
 		set -v;
 	fi
 
-	cd $SPECS_DIR
+	# icons are needed for successful spec parse
+	get_icons;
 
+	cd $SPECS_DIR
 	cache_rpm_dump
 
 	if [ "$NOSRCS" != "yes" ]; then
 		SOURCES="`rpm_dump | awk '/SOURCEURL[0-9]+/ {print $3}'`"
 	fi
+
 	if (rpm_dump | grep -qEi ":.*nosource.*1"); then
 		FAIL_IF_NO_SOURCES="no"
 	fi
 
 	PATCHES="`rpm_dump | awk '/PATCHURL[0-9]+/ {print $3}'`"
 	ICONS="`awk '/^Icon:/ {print $2}' ${SPECFILE}`"
-	PACKAGE_NAME="`$RPM -q --qf '%{NAME}\n' --specfile ${SPECFILE} 2> /dev/null | head -n 1`"
-	PACKAGE_VERSION="`$RPM -q --qf '%{VERSION}\n' --specfile ${SPECFILE} 2> /dev/null| head -n 1`"
-	PACKAGE_RELEASE="`$RPM -q --qf '%{RELEASE}\n' --specfile ${SPECFILE} 2> /dev/null | head -n 1`"
-
-# These variables may be unset after first cache_rpm_dump call
-# (because of not-yet-retrieved icon file)
-#
-#	if [ -z "$PACKAGE_NAME" -o -z "$PACKAGE_VERSION" -o -z "$PACKAGE_RELEASE" ]; then
-#		 Exit_error err_no_package_data;
-#	fi
+	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}')
 
 	if [ -n "$BE_VERBOSE" ]; then
 		echo "- Sources :  `nourl $SOURCES`"
@@ -397,6 +492,8 @@ parse_spec()
 		echo "- Version : $PACKAGE_VERSION"
 		echo "- Release : $PACKAGE_RELEASE"
 	fi
+
+	update_shell_title "parse_spec: OK!"
 }
 
 Exit_error()
@@ -429,11 +526,11 @@ Exit_error()
 			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}).";
 			exit 9 ;;
-	   "err_fract_rel" )
+		"err_fract_rel" )
 			remove_build_requires
 			echo "Release ${2} not integer and not a snapshot.";
 			exit 10 ;;
@@ -443,8 +540,8 @@ Exit_error()
 			exit 11 ;;
 
 	esac
-   echo "Unknown error."
-   exit 100
+	echo "Unknown error."
+	exit 100
 }
 
 init_builder()
@@ -454,8 +551,13 @@ init_builder()
 		set -v;
 	fi
 
-	SOURCE_DIR="`$RPM --eval '%{_sourcedir}'`"
-	SPECS_DIR="`$RPM --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`"
 }
@@ -471,50 +573,19 @@ get_spec()
 	fi
 
 	cd "$SPECS_DIR"
-	if [ \! -f "$SPECFILE" ]; then
+	if [ ! -f "$SPECFILE" ]; then
 		SPECFILE="`basename $SPECFILE .spec`.spec";
 	fi
 	if [ "$NOCVSSPEC" != "yes" ]; then
-		OPTIONS="up "
-
-		if [ -n "$CVSROOT" ]; then
-			OPTIONS="-d $CVSROOT $OPTIONS"
-		else
-			if [ ! -s CVS/Root -a "$NOCVSSPEC" != "yes" ]; then
-				echo "warning: No cvs access defined - using local .spec file"
-				NOCVSSPEC="yes"
-			fi
-		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
+		if [ ! -s CVS/Root -a "$NOCVSSPEC" != "yes" ]; then
+			echo "Warning: No CVS access defined - using local .spec file"
+			NOCVSSPEC="yes"
 		fi
 
-		result=1
-		retries_counter=0
-		while [ "$result" != "0" -a "$retries_counter" -le "$CVS_RETRIES" ]
-		do
-			retries_counter=$(( $retries_counter + 1 ))
-			output=$(LC_ALL=C cvs $OPTIONS $SPECFILE 2>&1)
-			result=$?
-			[ -n "$output" ] && echo "$output"
-			if [ "$result" -ne "0" ]; then
-				if (echo "$output" | grep -qE "(Cannot connect to|connect to .* failed|Connection reset by peer|Connection timed out|Unknown host)") && [ "$retries_counter" -le "$CVS_RETRIES" ]; then
-					echo "Trying again [$SPECFILE]... ($retries_counter)"
-					sleep 2
-					continue
-				fi
-				Exit_error err_no_spec_in_repo;
-			fi
-		done
+		cvsup "$SPECFILE" || Exit_error err_no_spec_in_repo
 	fi
+
 	if [ ! -f "$SPECFILE" ]; then
 		Exit_error err_no_spec_in_repo;
 	fi
@@ -525,24 +596,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
@@ -550,6 +625,7 @@ find_mirror()
 	echo "$url"
 }
 
+# Warning: unpredictable results if same URL used twice
 src_no ()
 {
 	cd $SPECS_DIR
@@ -559,49 +635,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 ()
@@ -613,8 +700,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 ()
@@ -630,51 +717,125 @@ cvsignore_df ()
 
 cvsup()
 {
-	 update_shell_title "cvsup"
-	 local OPTIONS="up "
-	 if [ -n "$CVSROOT" ]; then
-		  OPTIONS="-d $CVSROOT $OPTIONS"
-	 else
-		  if [ ! -s CVS/Root -a "$NOCVS" != "yes" ]; then
-				echo "warning: No cvs access defined for SOURCES"
-				NOCVS="yes"
-		  fi
-	 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
-	 update_shell_title "cvsup: $# files"
-	 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!"
+	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_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 "$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
+		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")
+		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."
+			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
+		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()
 {
-	GET_FILES="$@"
-	update_shell_title "fetching sources"
+	update_shell_title "get_files"
 
 	if [ -n "$DEBUG" ]; then
 		set -x;
@@ -684,80 +845,94 @@ get_files()
 	if [ $# -gt 0 ]; then
 		cd "$SOURCE_DIR"
 
-		local nf=$(echo "$GET_FILES" | wc -w)
+		if [ ! -s CVS/Root -a "$NOCVS" != "yes" ]; then
+			echo "Warning: No CVS access defined for SOURCES"
+			NOCVS="yes"
+		fi
+
 		local nc=0
 		local get_files_cvs=""
-		for i in $GET_FILES; do
+		for i in "$@"; do
 			nc=$((nc + 1))
-			SHELL_TITLE_PREFIX="get_files[$nc/$nf]"
+			local cvsup=0
+			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 [ -n "$(src_md5 "$i")" ] && [ -z "$NODIST" ]; 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=$(nourl "$i")
+					target="$fp"
 					url=$(distfiles_url "$i")
 					url_attic=$(distfiles_attic_url "$i")
 					FROM_DISTFILES=1
-					if [ "`echo $url | grep -E '^(\.|/)'`" ]; then
-						update_shell_title "${GETLOCAL}: $url"
+					# is $url local file?
+					if [[ "$url" = [./]* ]]; then
+						update_shell_title "${GETLOCAL%% *}: $url"
 						${GETLOCAL} $url $target
 					else
 						if [ -z "$NOMIRRORS" ]; then
 							url="`find_mirror "$url"`"
 						fi
-						update_shell_title "${GETURI}: $url"
+						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
 					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"
+							update_shell_title "${GETLOCAL%% *}: $url_attic"
 							${GETLOCAL} $url_attic $target
 						else
 							if [ -z "$NOMIRRORS" ]; then
 								url_attic="`find_mirror "$url_attic"`"
 							fi
-							update_shell_title "${GETURI}: $url_attic"
+							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 [ -z "$(src_md5 "$i")" -a "$NOCVS" != "yes" ]; then
-				   get_files_cvs="$get_files_cvs $fp"
-					continue
+				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)"
+						cvsup=1
+					else
+						cvsup $fp
+					fi
 				fi
 
 				if [ -z "$NOURLS" ] && [ ! -f "$fp" -o -n "$UPDATE" ] && [ "`echo $i | grep -E 'ftp://|http://|https://'`" ]; then
@@ -766,33 +941,26 @@ 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
 
+				if [ "$cvsup" = 1 ]; then
+					continue
+				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
 			fi
 
+			# we check md5 here just only to refetch immediately
 			if good_md5 "$i" && good_size "$i"; then
 				:
 			elif [ "$FROM_DISTFILES" = 1 ]; then
@@ -801,40 +969,32 @@ get_files()
 				echo "MD5 sum mismatch. Trying full fetch."
 				FROM_DISTFILES=2
 				rm -f $target
-				update_shell_title "${GETURI}: $url"
+				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"
+					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
-			CHMOD_FILES="`nourl $GET_FILES`"
+			CHMOD_FILES="`nourl "$@"`"
 			if [ -n "$CHMOD_FILES" ]; then
 				chmod $CHMOD_MODE $CHMOD_FILES
 			fi
@@ -843,21 +1003,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()
@@ -869,50 +1028,55 @@ tag_files()
 		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
 }
 
@@ -929,26 +1093,26 @@ branch_files()
 		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
 }
 
 
@@ -964,7 +1128,7 @@ build_package()
 	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
@@ -976,16 +1140,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;
-			if [ -n "$ICONS" ]; then
-				get_files $ICONS;
-				parse_spec;
-			fi
-			NODIST="yes" UPDATE5="yes" get_files "$SOURCES $PATCHES";
+			NODIST="yes" get_files $SOURCES $PATCHES;
+			UPDATE5="yes" update_md5 $SOURCES
+
 			unset TOLDVER TNEWVER TNOTIFY
 		fi
 	fi
@@ -1014,7 +1178,7 @@ build_package()
 			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
@@ -1025,13 +1189,15 @@ 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;
 	fi
@@ -1049,6 +1215,24 @@ install_required_packages()
 	return $?
 }
 
+find_spec_bcond() {
+	# taken from find-spec-bcond, but with just getting the list
+	local SPEC="$1"
+	# quick revert hint: '$RPMBUILD --bcond $SPEC'
+	awk -F"\n" '
+	/^%changelog/ { exit }
+	/_with(out)?_[_a-zA-Z0-9]+/{
+		match($0, /_with(out)?_[_a-zA-Z0-9]+/);
+		print substr($0, RSTART, RLENGTH);
+	}
+	/^%bcond_with/{
+		match($0, /bcond_with(out)?[ \t]+[_a-zA-Z0-9]+/);
+		bcond = substr($0, RSTART +5 , RLENGTH -5);
+		gsub(/[ \t]+/,"_",bcond);
+		print bcond
+	}' $SPEC | LC_ALL=C sort -u
+}
+
 set_bconds_values()
 {
 	update_shell_title "set bcond values"
@@ -1060,9 +1244,11 @@ set_bconds_values()
 	elif `egrep -q ^#\ *_with ${SPECFILE}`; then
 		BCOND_VERSION="OLD"
 	else
-		BCOND_VERSION="NONE"
+		return
 	fi
 
+	local bcond_avail=$(find_spec_bcond $SPECFILE)
+
 	# expand bconds from ~/.bcondrc
 	# The file structure is like gentoo's package.use:
 	# ---
@@ -1071,58 +1257,60 @@ set_bconds_values()
 	# w32codec-installer license_agreement
 	# php +mysqli
 	# ---
-	if [ "${BCOND_VERSION}" != "NONE" ] && ( [ -f $HOME/.bcondrc ] || ( [ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ] ) ) ; then
-		# This takes package name, first defined in spec.
-		# so consider that when defining flags for package.
-		PN=`$RPM -q --qf '%{NAME}\n' --specfile $SPECFILE | head -n 1`
+	if ([ -f $HOME/.bcondrc ] || ([ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ])); then
 		SN=${SPECFILE%%\.spec}
-		AVAIL=`$RPMBUILD --bcond $SPECFILE`
 
-		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
 
 			# any package or current package?
-			if [ "$pkg" = "*" ] || [ "$pkg" = "$PN" ] || [ "$pkg" = "$SN" ]; then
+			if [ "$pkg" = "*" ] || [ "$pkg" = "$PACKAGE_NAME" ] || [ "$pkg" = "$SN" ]; then
 				for flag in $flags; do
-					opt=${flag#[+-]}
+					local opt=${flag#[+-]}
 
 					# use only flags which are in this package.
-					if [[ $AVAIL = *${opt}* ]]; then
+					if [[ $bcond_avail = *${opt}* ]]; then
 						if [[ $flag = -* ]]; then
-							BCOND="$BCOND --without $opt"
+							if [[ $BCOND != *--with?${opt}* ]]; then
+								BCOND="$BCOND --without $opt"
+							fi
 						else
-							BCOND="$BCOND --with $opt"
+							if [[ $BCOND != *--without?${opt}* ]]; then
+								BCOND="$BCOND --with $opt"
+							fi
 						fi
 					fi
 				done
 			fi
-		done < $BCONDRC
+		done < $bcondrc
+		update_shell_title "parse ~/.bcondrc: DONE!"
 	fi
 
+	update_shell_title "parse bconds"
 	case "${BCOND_VERSION}" in
-		 NONE)
+		NONE)
 			:
 			;;
 		OLD)
 			echo "Warning: This spec has old style bconds. Fix it || die."
-			for opt in `$RPMBUILD --bcond $SPECFILE |grep ^_without_`
+			for opt in `echo "$bcond_avail" | grep ^_without_`
 			do
-				AVAIL_BCOND_WITHOUT=`echo $opt|sed -e "s/^_without_//g"`
-				if `echo $BCOND|grep -q -- "--without $AVAIL_BCOND_WITHOUT"`;then
+				AVAIL_BCOND_WITHOUT=${opt#_without_}
+				if [[ "$BCOND" = *--without?${AVAIL_BCOND_WITHOUT}* ]]; then
 					AVAIL_BCONDS_WITHOUT="$AVAIL_BCONDS_WITHOUT <$AVAIL_BCOND_WITHOUT>"
 				else
 					AVAIL_BCONDS_WITHOUT="$AVAIL_BCONDS_WITHOUT $AVAIL_BCOND_WITHOUT"
 				fi
 			done
 
-			for opt in `$RPMBUILD --bcond $SPECFILE |grep ^_with_`
+			for opt in `echo "$bcond_avail" | grep ^_with_`
 			do
-				AVAIL_BCOND_WITH=`echo $opt|sed -e "s/^_with_//g"`
-				if `echo $BCOND|grep -q -- "--with $AVAIL_BCOND_WITH"`;then
+				AVAIL_BCOND_WITH=${opt#_with_}
+				if [[ "$BCOND" = *--with?${AVAIL_BCOND_WITH}* ]]; then
 					AVAIL_BCONDS_WITH="$AVAIL_BCONDS_WITH <$AVAIL_BCOND_WITH>"
 				else
 					AVAIL_BCONDS_WITH="$AVAIL_BCONDS_WITH $AVAIL_BCOND_WITH"
@@ -1130,9 +1318,8 @@ set_bconds_values()
 			done
 			;;
 		NEW)
-			cond_type="" # with || without
-			for opt in `$RPMBUILD --bcond $SPECFILE`
-			do
+			local cond_type="" # with || without
+			for opt in $bcond_avail; do
 				case "$opt" in
 					_without)
 						cond_type="without"
@@ -1141,16 +1328,16 @@ set_bconds_values()
 						cond_type="with"
 						;;
 					_without_*)
-						AVAIL_BCOND_WITHOUT="`echo $opt | sed 's/^_without_//g'`"
-						if `echo $BCOND|grep -q -- "--without $AVAIL_BCOND_WITHOUT"`;then
+						AVAIL_BCOND_WITHOUT=${opt#_without_}
+						if [[ "$BCOND" = *--without?${AVAIL_BCOND_WITHOUT}* ]]; then
 							AVAIL_BCONDS_WITHOUT="$AVAIL_BCONDS_WITHOUT <$AVAIL_BCOND_WITHOUT>"
 						else
 							AVAIL_BCONDS_WITHOUT="$AVAIL_BCONDS_WITHOUT $AVAIL_BCOND_WITHOUT"
 						fi
 						;;
 					_with_*)
-						AVAIL_BCOND_WITH="`echo $opt | sed 's/^_with_//g'`"
-						if `echo $BCOND|grep -q -- "--with $AVAIL_BCOND_WITH"`;then
+						AVAIL_BCOND_WITH=${opt#_with_}
+						if [[ "$BCOND" = *--with?${AVAIL_BCOND_WITH}* ]]; then
 							AVAIL_BCONDS_WITH="$AVAIL_BCONDS_WITH <$AVAIL_BCOND_WITH>"
 						else
 							AVAIL_BCONDS_WITH="$AVAIL_BCONDS_WITH $AVAIL_BCOND_WITH"
@@ -1161,7 +1348,7 @@ set_bconds_values()
 							with)
 								cond_type=''
 								AVAIL_BCOND_WITH="$opt"
-								if `echo $BCOND|grep -q -- "--with $AVAIL_BCOND_WITH"`;then
+								if [[ "$BCOND" = *--with?${AVAIL_BCOND_WITH}* ]]; then
 									AVAIL_BCONDS_WITH="$AVAIL_BCONDS_WITH <$AVAIL_BCOND_WITH>"
 								else
 									AVAIL_BCONDS_WITH="$AVAIL_BCONDS_WITH $AVAIL_BCOND_WITH"
@@ -1170,7 +1357,7 @@ set_bconds_values()
 							without)
 								cond_type=''
 								AVAIL_BCOND_WITHOUT="$opt"
-								if `echo $BCOND|grep -q -- "--without $AVAIL_BCOND_WITHOUT"`;then
+								if [[ "$BCOND" = *--without?${AVAIL_BCOND_WITHOUT}* ]]; then
 									AVAIL_BCONDS_WITHOUT="$AVAIL_BCONDS_WITHOUT <$AVAIL_BCOND_WITHOUT>"
 								else
 									AVAIL_BCONDS_WITHOUT="$AVAIL_BCONDS_WITHOUT $AVAIL_BCOND_WITHOUT"
@@ -1222,24 +1409,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()
@@ -1277,10 +1464,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.
@@ -1288,21 +1475,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.
@@ -1310,15 +1497,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()
@@ -1339,7 +1526,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
@@ -1348,15 +1535,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
 
@@ -1437,11 +1624,11 @@ fetch_build_requires()
 						do
 							if [ "$package_name" = "$package" ]; then
 								echo -ne "Installing BuildRequired package:\t$package_name\n"
-								export PROMPT_COMMAND=`echo -ne "\033]0;${SPECFILE}: Installing BuildRequired package: ${package_name}\007"`
+								update_shell_title "Installing BuildRequired package: ${package_name}"
 								install_required_packages $package;
 							else
 								echo -ne "Installing (sub)Required package:\t$package_name\n"
-								export PROMPT_COMMAND=`echo -ne "\033]0;${SPECFILE}: Installing (sub)Required package: ${package_name}\007"`
+								update_shell_title "Installing (sub)Required package: ${package_name}"
 								install_required_packages $package_name;
 							fi
 							case $? in
@@ -1491,7 +1678,6 @@ fetch_build_requires()
 				fi
 			fi
 		done
-		export PROMPT_COMMAND=`echo -ne "\033]0;${SPECFILE}\007"`
 		if [ "$NOT_INSTALLED_PACKAGES" != "" ]; then
 			echo "Unable to install following packages and their dependencies:"
 			for pkg in "$NOT_INSTALLED_PACKAGES"
@@ -1504,6 +1690,27 @@ 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,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()
 
@@ -1516,13 +1723,13 @@ while test $# -gt 0
 do
 	case "${1}" in
 		-5 | --update-md5 )
-			COMMAND="get";
+			COMMAND="update_md5";
 			NODIST="yes"
 			NOCVSSPEC="yes"
 			UPDATE5="yes"
 			shift ;;
 		-a5 | --add-md5 )
-			COMMAND="get";
+			COMMAND="update_md5";
 			NODIST="yes"
 			NOCVS="yes"
 			NOCVSSPEC="yes"
@@ -1550,6 +1757,8 @@ do
 			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 )
@@ -1589,6 +1798,9 @@ do
 			NOSRCS="yes"
 			ALWAYS_CVSUP="no"
 			shift;;
+		--no-init )
+			NOINIT="yes"
+			shift;;
 		--opts )
 			shift; RPMOPTS="$RPM_OPTS ${1}"; shift ;;
 		--nopatch | -np )
@@ -1605,11 +1817,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
@@ -1634,6 +1846,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 ;;
@@ -1648,21 +1866,11 @@ do
 			TAG="STABLE"
 			TAG_VERSION="yes"
 			shift;;
-		-Tvn | --tag-version-nest )
-			COMMAND="tag";
-			TAG="NEST"
-			TAG_VERSION="yes"
-			shift;;
 		-Ts | --tag-stable )
 			COMMAND="tag";
 			TAG="STABLE"
 			TAG_VERSION="no"
 			shift;;
-		-Tn | --tag-nest )
-			COMMAND="tag";
-			TAG="NEST"
-			TAG_VERSION="no"
-			shift;;
 		-Tv | --tag-version )
 			COMMAND="tag";
 			TAG=""
@@ -1684,7 +1892,7 @@ do
 			INTEGER_RELEASE="yes"
 			shift;;
 		-U | --update )
-			COMMAND="get"
+			COMMAND="update_md5"
 			UPDATE="yes"
 			NOCVSSPEC="yes"
 			NODIST="yes"
@@ -1693,6 +1901,9 @@ do
 		-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 )
@@ -1702,9 +1913,14 @@ 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
 			;;
 		--show-bconds | -show-bconds | -print-bconds | --print-bconds | -display-bconds | --display-bconds )
 			SHOW_BCONDS="yes"
@@ -1715,14 +1931,28 @@ do
 			RPMOPTS="${RPMOPTS} --nodeps"
 			;;
 		-debug)
-			RPMOPTS="${RPMOPTS} -debug"; shift ;;
+			RPMBUILDOPTS="${RPMBUILDOPTS} -debug"; shift ;;
 		* )
 			SPECFILE="${1}"
-			export PROMPT_COMMAND=`echo -ne "\033]0;${SPECFILE}\007"`
-			shift ;;
+			# check if specname was passed as specname:cvstag
+			if [ "${SPECFILE##*:}" != "${SPECFILE}" ]; then
+				CVSTAG="${SPECFILE##*:}";
+				SPECFILE="${SPECFILE%%:*}";
+			fi
+			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 "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;
@@ -1737,18 +1967,24 @@ 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;
 		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;
-			parse_spec;
 			if [ "$INTEGER_RELEASE" = "yes" ]; then
 				echo "Checking release $PACKAGE_RELEASE..."
 				if echo $PACKAGE_RELEASE | grep -q '^[^.]*\.[^.]*$' 2>/dev/null ; then
@@ -1767,23 +2003,19 @@ 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 "$ICONS" ]; then
-				get_files $ICONS;
-				parse_spec;
-			fi
 			if [ -n "$NOSOURCE0" ] ; then
 				SOURCES=`echo $SOURCES | xargs | sed -e 's/[^ ]*//'`
 			fi
-			get_files "$SOURCES $PATCHES";
+			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
@@ -1798,12 +2030,16 @@ case "$COMMAND" in
 		if [ -n "$SPECFILE" ]; then
 			get_spec;
 			parse_spec;
-			if [ -n "$ICONS" ]; then
-				get_files $ICONS
-				parse_spec;
-			fi
-			get_files $SOURCES $PATCHES;
-			branch_files $TAG "$SOURCES $PATCHES $ICONS";
+			# 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;
 		fi
@@ -1812,17 +2048,27 @@ case "$COMMAND" in
 		init_builder;
 		if [ -n "$SPECFILE" ]; then
 			get_spec;
-			parse_spec;
-			if [ -n "$ICONS" ]; then
-				OLD_UPDATE5=$UPDATE5
-				UPDATE5= get_files $ICONS
-				UPDATE5=$OLD_UPDATE5
-				parse_spec;
-			fi
+			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;
+		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
@@ -1834,20 +2080,17 @@ case "$COMMAND" in
 		if [ -n "$SPECFILE" ]; then
 			get_spec;
 			parse_spec;
-			if [ -n "$ICONS" ]; then
-				get_files $ICONS
-				parse_spec;
-			fi
+
 			# 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;
 		fi
@@ -1861,9 +2104,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" )
@@ -1874,7 +2116,7 @@ case "$COMMAND" in
 		parse_spec
 		SAPS="$SOURCES $PATCHES"
 		for SAP in $SAPS ; do
-			 echo $SAP
+			echo $SAP
 		done
 		;;
 	"list-sources-local-paths" )
@@ -1883,11 +2125,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" )
@@ -1898,4 +2166,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