X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=builder_.sh;h=f9d2db7d59e807f495a26f6c7307a050f2c8b6c8;hb=8e43e5c1c7a996ffa9b72d033e3ce65c63a9cecc;hp=696161a28ab8946b4a9774a605da096d8adc338b;hpb=477f03e6de31fbd5592fe57ca23a927ee910888f;p=packages%2Frpm-build-tools.git

diff --git a/builder_.sh b/builder_.sh
index 696161a..f9d2db7 100644
--- a/builder_.sh
+++ b/builder_.sh
@@ -1,4 +1,8 @@
 #!/bin/ksh
+#
+# This program is free software, distributed under the terms of
+# the GNU General Public License Version 2.
+#
 # -----------
 # Exit codes:
 #	  0 - succesful
@@ -14,21 +18,34 @@
 #	 10 - Refused to build fractional release
 #	100 - Unknown error (should not happen)
 
-# Notes (todo):
-#	- builder -u fetches current version first (well that's okay, how you compare versions if you have no old spec?)
-#	- when Icon: field is present, -5 and -a5 doesn't work
-#	- builder -R skips installing BR if spec is not present before builder invocation (need to run builder twice)
-
-RCSID='$Id$'
-r=${RCSID#* * }
-rev=${r%% *}
-VERSION="v0.19/$rev"
+# Notes (todo/bugs):
+# - builder -u fetches current version first (well that's okay, how you compare versions if you have no old spec?)
+# - when Icon: field is present, -5 and -a5 doesn't work
+# - builder -R skips installing BR if spec is not present before builder invocation (need to run builder twice)
+# - does not respect NoSource: X, and tries to cvs up such files [ example: VirtualBox-bin.spec and its Source0 ]
+# TODO:
+# - ability to do ./builder -bb foo.spec foo2.spec foo3.spec
+# - funny bug, if source-md5 is set then builder will download from distfiles even if there is no url present:
+#   Source10:	forwardfix.pl
+#   # Source10-md5:	8bf85f7368933a4e0cb4f875bac28733
+# - builder --help:
+#	basename: missing operand
+#	Try `basename --help' for more information.
+#	-- and the normal usage info --
+
+PROGRAM=${0##*/}
+APPDIR=$(d=$0; [ -L "$d" ] && d=$(readlink -f "$d"); dirname "$d")
+RCSID='$Id$' r=${RCSID#* * } rev=${r%% *}
+VERSION="v0.35/$rev"
 VERSIONSTRING="\
 Build package utility from PLD Linux CVS repository
-$VERSION (C) 1999-2007 Free Penguins".
+$VERSION (C) 1999-2010 Free Penguins".
 
 PATH="/bin:/usr/bin:/usr/sbin:/sbin:/usr/X11R6/bin"
 
+# required rpm-build-macros
+RPM_MACROS_VER=1.534
+
 COMMAND="build"
 TARGET=""
 
@@ -50,6 +67,9 @@ ALWAYS_CVSUP=${ALWAYS_CVSUP:-"yes"}
 CVSROOT=""
 GREEDSRC=""
 
+# use rpm 4.4.6+ digest format instead of comments if non-zero
+USEDIGEST=
+
 # user agent when fetching files
 USER_AGENT="PLD/Builder($VERSION)"
 
@@ -59,6 +79,8 @@ DATE=`date +%Y-%m-%d_%H-%M-%S`
 
 # Example: LOGFILE='../log.$PACKAGE_NAME'
 # Example: LOGFILE='../LOGS/log.$PACKAGE_NAME.$DATE'
+# Example: LOGFILE='$PACKAGE_NAME/$PACKAGE_NAME.$DATE.log'
+# Example: LOGFILE='$PACKAGE_NAME.$DATE.log'
 # Yes, you can use variable name! Note _single_ quotes!
 LOGFILE=''
 
@@ -68,12 +90,14 @@ LOGDIRFAIL=""
 LASTLOG_FILE=""
 
 CHMOD="no"
-CHMOD_MODE="0444"
+CHMOD_MODE="0644"
 RPMOPTS=""
 RPMBUILDOPTS=""
 BCOND=""
 GROUP_BCONDS="no"
-CVSIGNORE_DF="no"
+
+# create symlinks for tools in PACKAGE_DIR, see get_spec()
+SYMLINK_TOOLS="no"
 
 PATCHES=""
 SOURCES=""
@@ -84,13 +108,16 @@ PACKAGE_NAME=""
 ASSUMED_NAME=""
 PROTOCOL="ftp"
 WGET_RETRIES=${MAX_WGET_RETRIES:-0}
-CVS_RETRIES=${MAX_CVS_RETRIES:-1000}
 
+CVS_COMMAND=${CVS_COMMAND:-cvs}
+CVS_FORCE=""
+CVSIGNORE_DF="yes"
+CVS_RETRIES=${MAX_CVS_RETRIES:-1000}
+CVS_SERVER="cvs.pld-linux.org"
 CVSTAG=""
+
 RES_FILE=""
-CVS_FORCE=""
 
-CVS_SERVER="cvs.pld-linux.org"
 DISTFILES_SERVER="://distfiles.pld-linux.org"
 ATTICDISTFILES_SERVER="://attic-distfiles.pld-linux.org"
 
@@ -106,12 +133,19 @@ TRY_UPGRADE=""
 # should the specfile be restored if upgrade failed?
 REVERT_BROKEN_UPGRADE="yes"
 
-if [ -x /usr/bin/rpm-getdeps ]; then
-	FETCH_BUILD_REQUIRES_RPMGETDEPS="yes"
-else
+if rpm --specsrpm 2>/dev/null; then
+	FETCH_BUILD_REQUIRES_RPMSPECSRPM="yes"
 	FETCH_BUILD_REQUIRES_RPMGETDEPS="no"
+else
+	FETCH_BUILD_REQUIRES_RPMSPECSRPM="no"
+	if [ -x /usr/bin/rpm-getdeps ]; then
+		FETCH_BUILD_REQUIRES_RPMGETDEPS="yes"
+	else
+		FETCH_BUILD_REQUIRES_RPMGETDEPS="no"
+	fi
 fi
 
+
 # Here we load saved user environment used to
 # predefine options set above, or passed to builder
 # in command line.
@@ -178,12 +212,27 @@ else
 	RPMBUILD="rpmbuild"
 fi
 
-POLDEK_INDEX_DIR="`$RPM --eval %_rpmdir`/"
+#
+# sanity checks
+#
+if [ -d $HOME/rpm/SOURCES ]; then
+	echo "ERROR: ~/rpm/{SPECS,SOURCES} structure is obsolete" >&2
+	echo "ERROR: get rid of your ~/rpm/SOURCES" >&2
+	exit 1
+fi
+
+#
+# are we using cvs-nserver ?
+#
+CVS_NSERVER=0
+$CVS_COMMAND --version 2>&1 | grep -q 'CVS-nserver'
+[ $? -eq 0 ] && CVS_NSERVER=1
+
+POLDEK_INDEX_DIR="$($RPM --eval %_rpmdir)/"
 POLDEK_CMD="$SU_SUDO /usr/bin/poldek --noask"
 
-run_poldek()
-{
-	RES_FILE=~/tmp/poldek-exit-status.$RANDOM
+run_poldek() {
+	RES_FILE=$(mktemp -t builder.XXXXXX || ${TMPDIR:-/tmp}/builder.$RANDOM)
 	if [ -n "$LOGFILE" ]; then
 		LOG=`eval echo $LOGFILE`
 		if [ -n "$LASTLOG_FILE" ]; then
@@ -201,8 +250,7 @@ run_poldek()
 #---------------------------------------------
 # functions
 
-usage()
-{
+usage() {
 	if [ -n "$DEBUG" ]; then set -xv; fi
 	echo "\
 Usage: builder [-D|--debug] [-V|--version] [--short-version] [-a|--as_anon] [-b|-ba|--build]
@@ -236,13 +284,18 @@ Usage: builder [-D|--debug] [-V|--version] [--short-version] [-a|--as_anon] [-b|
                       them into src.rpm,
 --short-circuit     - short-circuit build
 -B, --branch        - add branch
--c, --clean         - clean all temporarily created files (in BUILD, SOURCES,
-                      SPECS and \$RPM_BUILD_ROOT),
+-c, --clean         - clean all temporarily created files (in BUILD\$RPM_BUILD_ROOT) after rpmbuild commands.
+                      may be used with building process.
+-m, --mr-proper     - clean all temporarily created files (in BUILD, SOURCES,
+					  SPECS and \$RPM_BUILD_ROOT and CVS/Entries). Doesn't run
+					  any rpm building.
 -cf, --cvs-force	- use -F when tagging (useful when moving branches)
 -d <cvsroot>, --cvsroot <cvsroot>
                     - setup \$CVSROOT,
 --define <macro> <value>
                     - define a macro <macro> with value <value>,
+--alt_kernel <kernel>
+                    - same as --define 'alt_kernel <kernel>'
 --nodeps            - rpm won't check any dependences
 -g, --get           - get <package>.spec and all related files from CVS repo
                       or HTTP/FTP,
@@ -250,15 +303,13 @@ Usage: builder [-D|--debug] [-V|--version] [--short-version] [-a|--as_anon] [-b|
 --http              - use http instead of ftp,
 -l <logfile>, --logtofile <logfile>
                     - log all to file,
--m, --mr-proper     - only remove all files related to spec file and all work
-                      resources,
 -nc, --no-cvs       - don't download sources from CVS, if source URL is given,
 -ncs, --no-cvs-specs
                     - don't check specs in CVS
 -nd, --no-distfiles - don't download from distfiles
 -nm, --no-mirrors   - don't download from mirror, if source URL is given,
 -nu, --no-urls      - don't try to download from FTP/HTTP location,
--ns, --no-srcs      - don't download Sources
+-ns, --no-srcs      - don't download Sources/Patches
 -ns0, --no-source0  - don't download Source0
 -nn, --no-net       - don't download anything from the net
 -pm, --prefer-mirrors - prefer mirrors (if any) over distfiles for SOURCES
@@ -315,7 +366,7 @@ Usage: builder [-D|--debug] [-V|--version] [--short-version] [-a|--as_anon] [-b|
                     - as above, but allow float version
 --use-greed-sources
                     - try download source from tag head if don't find it in
-                      current tag	
+                      current tag
 -U, --update        - refetch sources, don't use distfiles, and update md5 comments
 -Upi, --update-poldek-indexes
                     - refresh or make poldek package index files.
@@ -326,6 +377,7 @@ Usage: builder [-D|--debug] [-V|--version] [--short-version] [-a|--as_anon] [-b|
 --show-bcond-args   - show active bconds, from ~/.bcondrc. this is used by
                       ./repackage.sh script. in other words, the output is
                       parseable by scripts.
+--show-avail-bconds - show available bconds
 --with/--without <feature>
                     - conditional build package depending on %_with_<feature>/
                       %_without_<feature> macro switch.  You may now use
@@ -337,16 +389,26 @@ Usage: builder [-D|--debug] [-V|--version] [--short-version] [-a|--as_anon] [-b|
 "
 }
 
+# change dependency to specname
+# common changes:
+# - perl(Package::Name) -> perl-Package-Name
+depspecname() {
+	local package="$1"
+
+	package=$(echo "$package" | sed -e '/perl(.*)/{s,perl(\(.*\)),perl-\1,;s,::,-,g};' -e 's/-\(devel\|static\)$//' )
+	echo "$package"
+}
+
 update_shell_title() {
 	[ -t 1 ] || return
 	local len=${COLUMNS:-80}
-	local msg=$(echo "$*" | cut -c-$len)
+	local msg="$(echo "$*" | cut -c-$len)"
 
 	if [ -n "$BE_VERBOSE" ]; then
 		echo >&2 "$(date +%s.%N) $*"
 	fi
 
-	if [ "x$TITLECHANGE" == "xyes" -o "x$TITLECHANGE" == "x" ]; then
+	if [ "x$TITLECHANGE" = "xyes" -o "x$TITLECHANGE" = "x" ]; then
 		local pkg
 		if [ -n "$PACKAGE_NAME" ]; then
 			pkg=${PACKAGE_NAME}-${PACKAGE_VERSION}-${PACKAGE_RELEASE}
@@ -355,7 +417,7 @@ update_shell_title() {
 		fi
 
 		msg="$pkg: ${SHELL_TITLE_PREFIX:+$SHELL_TITLE_PREFIX }$msg"
-		msg="$(echo $msg | tr -d '\n\r')"
+		msg=$(echo $msg | tr -d '\n\r')
 		case "$TERM" in
 			cygwin|xterm*)
 			echo >&2 -ne "\033]1;$msg\007\033]2;$msg\007"
@@ -370,7 +432,7 @@ update_shell_title() {
 # set TARGET from BuildArch: from SPECFILE
 set_spec_target() {
 	if [ -n "$SPECFILE" ] && [ -z "$TARGET" ]; then
-		tmp=$(awk '/^BuildArch:/ { print $NF}' $SPECFILE)
+		tmp=$(awk '/^BuildArch:/ { print $NF; exit }' $ASSUMED_NAME/$SPECFILE)
 		if [ "$tmp" ]; then
 				target_platform=$(rpm -E '%{_target_vendor}-%{_target_os}%{?_gnu}')
 				TARGET="$tmp"
@@ -389,23 +451,24 @@ minirpm() {
 	# we reset macros not to contain macros.build as all the %() macros are
 	# executed here, while none of them are actually needed.
 	# at the time of this writing macros.build + macros contained 70 "%(...)" macros.
-	safe_macrofiles=$(rpm --showrc | awk -F: '/^macrofiles/ { gsub(/^macrofiles[ \t]+:/, "", $0); gsub(/:.*macros.build:/, ":", $0); print $0 } ')
+	safe_macrofiles=$(rpm $TARGET_SWITCH --showrc | awk -F: '/^macrofiles/ { gsub(/^macrofiles[ \t]+:/, "", $0); gsub(/:.*macros.build:/, ":", $0); print $0 } ')
 
 	# TODO: move these to /usr/lib/rpm/macros
 	cat > $BUILDER_MACROS <<'EOF'
 %x8664 x86_64 amd64 ia32e
 %alt_kernel %{nil}
 %_alt_kernel %{nil}
-%requires_releq_kernel_up %{nil}
-%requires_releq_kernel_smp %{nil}
-%requires_releq_kernel %{nil}
+%bootstrap_release() %{1}
+%requires_releq_kernel_up(s:n:) %{nil}
+%requires_releq_kernel_smp(s:n:) %{nil}
+%requires_releq_kernel(s:n:) %{nil}
 %requires_releq() %{nil}
 %pyrequires_eq() %{nil}
 %requires_eq() %{nil}
 %requires_eq_to() %{nil}
-%releq_kernel_up ERROR
-%releq_kernel_smp ERROR
-%releq_kernel ERROR
+%releq_kernel_up(n:) ERROR
+%releq_kernel_smp(n:) ERROR
+%releq_kernel(n:) ERROR
 %kgcc_package ERROR
 %_fontsdir ERROR
 %ruby_version ERROR
@@ -414,6 +477,10 @@ minirpm() {
 %__php_api_requires() %{nil}
 %php_major_version ERROR
 %php_api_version ERROR
+%requires_xorg_xserver_extension %{nil}
+%requires_xorg_xserver_xinput %{nil}
+%requires_xorg_xserver_font %{nil}
+%requires_xorg_xserver_videodrv %{nil}
 %py_ver ERROR
 %perl_vendorarch ERROR
 %perl_vendorlib ERROR
@@ -430,6 +497,12 @@ minirpm() {
 	rm -f %{tmpdir}/__ps{1,2};
 ) \
 %{nil}
+%add_etc_shells(p) %{p:<lua>}
+%remove_etc_shells(p) %{p:<lua>}
+%lua_add_etc_shells()  %{nil}
+%lua_remove_etc_shells() %{nil}
+%required_jdk %{nil}
+%buildrequires_jdk %{nil}
 EOF
 	if [ "$NOINIT" = "yes" ] ; then
 		cat >> $BUILDER_MACROS <<'EOF'
@@ -437,7 +510,7 @@ EOF
 %_sourcedir ./
 EOF
 	fi
-	eval $RPMBUILD --macros "$safe_macrofiles:$BUILDER_MACROS" $QUIET $RPMOPTS $RPMBUILDOPTS $BCOND $TARGET_SWITCH $* 2>&1
+	eval $RPMBUILD $TARGET_SWITCH --macros "$safe_macrofiles:$BUILDER_MACROS" $QUIET $RPMOPTS $RPMBUILDOPTS $BCOND $* 2>&1
 }
 
 cache_rpm_dump() {
@@ -446,49 +519,53 @@ cache_rpm_dump() {
 		set -v
 	fi
 
-	update_shell_title "cache_rpm_dump"
-	local rpm_dump
-	rpm_dump=`
-		# what we need from dump is NAME, VERSION, RELEASE and PATCHES/SOURCES.
-		dump='%{echo:dummy: PACKAGE_NAME %{name} }%dump'
-		case "$RPMBUILD" in
-		rpm)
-			ARGS='-bp'
-			;;
-		rpmbuild)
-			ARGS='--nodigest --nosignature --nobuild'
-			;;
-		esac
-		minirpm $ARGS --define "'prep $dump'" --nodeps $SPECFILE
-	`
-	if [ $? -gt 0 ]; then
-		error=$(echo "$rpm_dump" | sed -ne '/^error:/,$p')
-		echo "$error" >&2
-		Exit_error err_build_fail
-	fi
+	if [ -x /usr/bin/rpm-specdump ]; then
+		update_shell_title "cache_rpm_dump using rpm-specdump command"
+		rpm_dump_cache=$(rpm-specdump $TARGET_SWITCH $BCOND $SPECFILE)
+	else
+		update_shell_title "cache_rpm_dump using rpmbuild command"
+		local rpm_dump
+		rpm_dump=`
+			# what we need from dump is NAME, VERSION, RELEASE and PATCHES/SOURCES.
+			dump='%{echo:dummy: PACKAGE_NAME %{name} }%dump'
+			case "$RPMBUILD" in
+			rpm)
+				ARGS='-bp'
+				;;
+			rpmbuild)
+				ARGS='--nodigest --nosignature --nobuild'
+				;;
+			esac
+			minirpm $ARGS --define "'prep $dump'" --nodeps $SPECFILE
+		`
+		if [ $? -gt 0 ]; then
+			error=$(echo "$rpm_dump" | sed -ne '/^error:/,$p')
+			echo "$error" >&2
+			Exit_error err_build_fail
+		fi
 
-	# make small dump cache
-	rpm_dump_cache=`echo "$rpm_dump" | awk '
-		$2 ~ /^SOURCEURL/ {print}
-		$2 ~ /^PATCHURL/  {print}
-		$2 ~ /^nosource/ {print}
-		$2 ~ /^PACKAGE_/ {print}
-	'`
+		# make small dump cache
+		rpm_dump_cache=`echo "$rpm_dump" | awk '
+			$2 ~ /^SOURCEURL/ {print}
+			$2 ~ /^PATCHURL/  {print}
+			$2 ~ /^nosource/ {print}
+			$2 ~ /^PACKAGE_/ {print}
+		'`
+	fi
 
 	update_shell_title "cache_rpm_dump: OK!"
 }
 
 rpm_dump() {
 	if [ -z "$rpm_dump_cache" ] ; then
-		echo "internal error: cache_rpm_dump not called! (missing %prep?)" 1>&2
+		echo >&2 "internal error: cache_rpm_dump not called! (missing %prep?)"
 	fi
 	echo "$rpm_dump_cache"
 }
 
-get_icons()
-{
+get_icons() {
 	update_shell_title "get icons"
-	ICONS="`awk '/^Icon:/ {print $2}' ${SPECFILE}`"
+	ICONS=$(awk '/^Icon:/ {print $2}' $PACKAGE_DIR/${SPECFILE})
 	if [ -z "$ICONS" ]; then
 		return
 	fi
@@ -496,8 +573,7 @@ get_icons()
 	rpm_dump_cache="kalasaba" NODIST="yes" get_files $ICONS
 }
 
-parse_spec()
-{
+parse_spec() {
 	update_shell_title "parsing specfile"
 	if [ -n "$DEBUG" ]; then
 		set -x
@@ -507,19 +583,19 @@ parse_spec()
 	# icons are needed for successful spec parse
 	get_icons
 
-	cd $SPECS_DIR
+	cd $PACKAGE_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}`"
+	if [ "$NOSRCS" != "yes" ]; then
+		SOURCES=$(rpm_dump | awk '$2 ~ /^SOURCEURL[0-9]+/ {print substr($2, length("SOURCEURL") + 1), $3}' | LC_ALL=C sort -n | awk '{print $2}')
+		PATCHES=$(rpm_dump | awk '$2 ~ /^PATCHURL[0-9]+/ {print substr($2, length("PATCHURL") + 1), $3}' | LC_ALL=C sort -n | awk '{print $2}')
+		ICONS=$(awk '/^Icon:/ {print $2}' ${SPECFILE})
+	fi
+
 	PACKAGE_NAME=$(rpm_dump | awk '$2 == "PACKAGE_NAME" { print $3; exit}')
 	PACKAGE_VERSION=$(rpm_dump | awk '$2 == "PACKAGE_VERSION" { print $3; exit}')
 	PACKAGE_RELEASE=$(rpm_dump | awk '$2 == "PACKAGE_RELEASE" { print $3; exit}')
@@ -548,8 +624,7 @@ parse_spec()
 	update_shell_title "parse_spec: OK!"
 }
 
-Exit_error()
-{
+Exit_error() {
 	if [ -n "$DEBUG" ]; then
 		set -x
 		set -v
@@ -560,72 +635,78 @@ Exit_error()
 	case "$1" in
 		"err_no_spec_in_cmdl" )
 			remove_build_requires
-			echo "ERROR: spec file name not specified."
+			echo >&2 "ERROR: spec file name not specified."
 			exit 2 ;;
 		"err_invalid_cmdline" )
-			echo "ERROR: invalid command line arg ($2)."
+			echo >&2 "ERROR: invalid command line arg ($2)."
 			exit 2 ;;
 		"err_no_spec_in_repo" )
 			remove_build_requires
-			echo "Error: spec file not stored in CVS repo."
+			echo >&2 "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 >&2 "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 >&2 "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."
+			echo >&2 "Error: couldn't get out package name/version/release from spec file."
 			exit 6 ;;
 		"err_tag_exists" )
 			remove_build_requires
-			echo "Tag ${2} already exists (spec release: ${3})."
+			echo >&2 "Tag ${2} already exists (spec release: ${3})."
 			exit 9 ;;
 		"err_fract_rel" )
 			remove_build_requires
-			echo "Release ${2} not integer and not a snapshot."
+			echo >&2 "Release ${2} not integer and not a snapshot."
 			exit 10 ;;
 		"err_branch_exists" )
 			remove_build_requires
-			echo "Tree branch already exists (${2})."
+			echo >&2 "Tree branch already exists (${2})."
 			exit 11 ;;
 		"err_acl_deny" )
 			remove_build_requires
-			echo "Error: conditions reject building this spec (${2})."
+			echo >&2 "Error: conditions reject building this spec (${2})."
 			exit 12 ;;
 	esac
-	echo "Unknown error."
+	echo >&2 "Unknown error."
 	exit 100
 }
 
-init_builder()
-{
+init_builder() {
 	if [ -n "$DEBUG" ]; then
 		set -x
 		set -v
 	fi
 
 	if [ "$NOINIT" != "yes" ] ; then
-		local extra
-		if [ "$ASSUMED_NAME" ]; then
-			extra="--define 'name $ASSUMED_NAME'"
+		TOP_DIR=$(eval $RPM $RPMOPTS --eval '%{_topdir}')
+
+		local macros_ver=$(rpm -E %?rpm_build_macros)
+		if [ -z "$macros_ver" ]; then
+			REPO_DIR=$TOP_DIR/packages
+			PACKAGE_DIR=$TOP_DIR/packages/$ASSUMED_NAME
+		else
+			if awk "BEGIN{exit($macros_ver>=$RPM_MACROS_VER)}"; then
+				echo >&2 "builder requires rpm-build-macros >= $RPM_MACROS_VER"
+				exit 1
+			fi
+			REPO_DIR=$TOP_DIR
+			PACKAGE_DIR=$REPO_DIR/$ASSUMED_NAME
 		fi
-		SOURCE_DIR="`eval $RPM $RPMOPTS $extra --eval '%{_sourcedir}'`"
-		SPECS_DIR="`eval $RPM $RPMOPTS $extra --eval '%{_specdir}'`"
 	else
-		SOURCE_DIR="."
-		SPECS_DIR="."
+		REPO_DIR="."
+		PACKAGE_DIR="."
 	fi
 
-	__PWD="`pwd`"
+	__PWD=$(pwd)
 }
 
-get_spec()
-{
+get_spec() {
 
 	update_shell_title "get_spec"
 
@@ -634,9 +715,10 @@ get_spec()
 		set -v
 	fi
 
-	cd "$SPECS_DIR"
-	if [ ! -f "$SPECFILE" ]; then
-		SPECFILE="`basename $SPECFILE .spec`.spec"
+	cd "$REPO_DIR"
+	if [ ! -f "$ASSUMED_NAME/$SPECFILE" ]; then
+		# XXX: still needed?
+		SPECFILE=$(basename $SPECFILE)
 	fi
 	if [ "$NOCVSSPEC" != "yes" ]; then
 
@@ -645,41 +727,57 @@ get_spec()
 			NOCVSSPEC="yes"
 		fi
 
-		cvsup "$SPECFILE" || Exit_error err_no_spec_in_repo
+		if [ -d "$ASSUMED_NAME" ]; then
+			cvsup "$ASSUMED_NAME/$SPECFILE" || Exit_error err_no_spec_in_repo
+		else
+			cvsup -c -d $ASSUMED_NAME "packages/$ASSUMED_NAME/$SPECFILE" || Exit_error err_no_spec_in_repo
+
+			# remove Entries.Static -- so 'cvs up' would update all files in a repo
+			rm "$ASSUMED_NAME/CVS/Entries.Static"
+			cvsignore_df .cvsignore
+
+			# create symlinks for tools
+			if [ "$SYMLINK_TOOLS" != "no" ]; then
+				for a in dropin md5 adapter builder {relup,compile,repackage,rsync,pearize}.sh; do
+					[ -f $a ] || continue
+					ln -s ../$a $ASSUMED_NAME
+					cvsignore_df $a
+				done
+			fi
+		fi
 	fi
 
-	if [ ! -f "$SPECFILE" ]; then
+	if [ ! -f "$ASSUMED_NAME/$SPECFILE" ]; then
 		Exit_error err_no_spec_in_repo
 	fi
 
 	if [ "$CHMOD" = "yes" -a -n "$SPECFILE" ]; then
-		chmod $CHMOD_MODE $SPECFILE
+		chmod $CHMOD_MODE $ASSUMED_NAME/$SPECFILE
 	fi
 	unset OPTIONS
-	[ -n "$DONT_PRINT_REVISION" ] || grep -E -m 1 "^#.*Revision:.*Date" $SPECFILE
+	[ -n "$DONT_PRINT_REVISION" ] || grep -E -m 1 "^#.*Revision:.*Date" $ASSUMED_NAME/$SPECFILE
 
 	set_spec_target
 }
 
-find_mirror()
-{
-	cd "$SPECS_DIR"
+find_mirror() {
+	cd "$REPO_DIR"
 	local url="$1"
 	if [ ! -f "mirrors" -a "$NOCVSSPEC" != "yes" ] ; then
-		cvs update mirrors >&2
+		$CVS_COMMAND update mirrors >&2
 	fi
 
 	IFS="|"
 	local origin mirror name rest ol prefix
 	while read origin mirror name rest; do
 		# skip comments and empty lines
-		if [ -z "$origin" ] || [[ $origin == \#* ]]; then
+		if [ -z "$origin" ] || [ "${origin#\#}" != "$origin" ]; then
 			continue
 		fi
-		ol=`echo -n "$origin"|wc -c`
-		prefix="`echo -n "$url" | head -c $ol`"
+		ol=$(echo -n "$origin" | wc -c)
+		prefix=$(echo -n "$url" | head -c $ol)
 		if [ "$prefix" = "$origin" ] ; then
-			suffix="`echo "$url"|cut -b $((ol+1))-`"
+			suffix=$(echo "$url" | cut -b $((ol+1))-)
 			echo -n "$mirror$suffix"
 			return 0
 		fi
@@ -688,27 +786,25 @@ find_mirror()
 }
 
 # Warning: unpredictable results if same URL used twice
-src_no ()
-{
-	cd $SPECS_DIR
+src_no() {
+	cd $PACKAGE_DIR
 	rpm_dump | \
 	grep "SOURCEURL[0-9]*[ 	]*$1""[ 	]*$" | \
 	sed -e 's/.*SOURCEURL\([0-9][0-9]*\).*/\1/' | \
 	head -n 1 | xargs
 }
 
-src_md5()
-{
+src_md5() {
 	[ "$NO5" = "yes" ] && return
 	no=$(src_no "$1")
 	[ -z "$no" ] && return
-	cd $SPECS_DIR
+	cd $PACKAGE_DIR
 	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/')"
+			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 | \
@@ -725,62 +821,67 @@ src_md5()
 		fi
 	fi
 
-	source_md5=`grep -i "#[ 	]*Source$no-md5[ 	]*:" $SPECFILE | sed -e 's/.*://'`
+	source_md5=`grep -i "^#[ 	]*Source$no-md5[ 	]*:" $SPECFILE | sed -e 's/.*://'`
 	if [ -n "$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 [ -n "$nosource_md5" -a -n "`grep -i "^NoSource:[	 ]*$no$" $SPECFILE`" ] ; then
-			echo $nosource_md5
+		source_md5=`grep -i "BuildRequires:[ 	]*digest(%SOURCE$no)[ 	]*=" $SPECFILE | sed -e 's/.*=//'`
+		if [ -n "$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 [ -n "$nosource_md5" -a -n "`grep -i "^NoSource:[	 ]*$no$" $SPECFILE`" ] ; then
+				echo $nosource_md5
+			fi
 		fi
 	fi
 }
 
-distfiles_path ()
-{
+distfiles_path() {
 	echo "by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")"
 }
 
-distfiles_url ()
-{
+distfiles_url() {
 	echo "$PROTOCOL$DISTFILES_SERVER/distfiles/$(distfiles_path "$1")"
 }
 
-distfiles_attic_url ()
-{
+distfiles_attic_url() {
 	echo "$PROTOCOL$ATTICDISTFILES_SERVER/distfiles/Attic/$(distfiles_path "$1")"
 }
 
-good_md5 ()
-{
+good_md5() {
 	md5=$(src_md5 "$1")
 	[ "$md5" = "" ] || \
 	[ "$md5" = "$(md5sum $(nourl "$1") 2> /dev/null | sed -e 's/ .*//')" ]
 }
 
-good_size ()
-{
-	size="$(find $(nourl "$1") -printf "%s" 2>/dev/null)"
+good_size() {
+	size=$(find $(nourl "$1") -printf "%s" 2>/dev/null)
 	[ -n "$size" -a "$size" -gt 0 ]
 }
 
-cvsignore_df ()
-{
+cvsignore_df() {
 	if [ "$CVSIGNORE_DF" != "yes" ]; then
 		return
 	fi
-	cvsignore=${SOURCE_DIR}/.cvsignore
-	if ! grep -q "^$1\$" $cvsignore 2> /dev/null; then
+	cvsignore=${PACKAGE_DIR}/.cvsignore
+
+	# add only if not yet there
+	if ! awk -vf="$1" -vc=1 '$0 == f { c = 0 } END { exit c }' $cvsignore 2>/dev/null; then
 		echo "$1" >> $cvsignore
 	fi
 }
 
-cvsup()
-{
+cvsup() {
 	update_shell_title "cvsup"
 	local OPTIONS="up "
+
+	if [ "$1" = "-c" ]; then
+		OPTIONS="co "
+		shift
+	fi
 	if [ -n "$CVSROOT" ]; then
 		OPTIONS="-d $CVSROOT $OPTIONS"
 	fi
@@ -805,7 +906,7 @@ cvsup()
 	fi
 	while [ "$result" != "0" -a "$retries_counter" -le "$CVS_RETRIES" ]; do
 		retries_counter=$(( $retries_counter + 1 ))
-		output=$(LC_ALL=C cvs $OPTIONS "$@" 2>&1)
+		output=$(LC_ALL=C $CVS_COMMAND $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
@@ -822,8 +923,7 @@ cvsup()
 }
 
 # returns true if "$1" is ftp, http or https protocol url
-is_url()
-{
+is_url() {
 	case "$1" in
 	ftp://*|http://*|https://*)
 		return 0
@@ -832,8 +932,7 @@ is_url()
 	return 1
 }
 
-update_md5()
-{
+update_md5() {
 	if [ $# -eq 0 ]; then
 		return
 	fi
@@ -844,7 +943,7 @@ update_md5()
 		set -v
 	fi
 
-	cd "$SOURCE_DIR"
+	cd "$PACKAGE_DIR"
 
 	# pass 1: check files to be fetched
 	local todo
@@ -854,9 +953,10 @@ update_md5()
 		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
+			grep -qiE '^#[ 	]*Source'$srcno'-md5[ 	]*:' $PACKAGE_DIR/$SPECFILE && continue
+			grep -qiE '^BuildRequires:[ 	]*digest[(]%SOURCE'$srcno'[)][ 	]*=' $PACKAGE_DIR/$SPECFILE && continue
 		else
-			grep -qiE '^#[ 	]*Source'$srcno'-md5[ 	]*:' $SPECS_DIR/$SPECFILE || continue
+			grep -qiE '^#[ 	]*Source'$srcno'-md5[ 	]*:' $PACKAGE_DIR/$SPECFILE || grep -qiE '^BuildRequires:[ 	]*digest[(]%SOURCE'$srcno'[)][ 	]*=' $PACKAGE_DIR/$SPECFILE || continue
 		fi
 		if [ ! -f "$fp" ] || [ $ALWAYS_CVSUP = "yes" ]; then
 			need_files="$need_files $i"
@@ -872,40 +972,54 @@ update_md5()
 	for i in "$@"; do
 		local fp=$(nourl "$i")
 		local srcno=$(src_no "$i")
-		local md5=$(grep -iE '^#[ 	]*(No)?Source'$srcno'-md5[ 	]*:' $SPECS_DIR/$SPECFILE )
+		local md5=$(grep -iE '^#[ 	]*(No)?Source'$srcno'-md5[ 	]*:' $PACKAGE_DIR/$SPECFILE )
+		if [ -z "$md5" ]; then
+			md5=$(grep -iE '^[ 	]*BuildRequires:[ 	]*digest[(]%SOURCE'$srcno'[)][ 	]*=' $PACKAGE_DIR/$SPECFILE )
+		fi
 		if [ -n "$ADD5" ] && is_url $i || [ -n "$md5" ]; then
-			local tag="Source$srcno-md5"
+			local tag="# Source$srcno-md5:\t"
 			if [[ "$md5" == *NoSource* ]]; then
-				tag="NoSource$srcno-md5"
+				tag="# NoSource$srcno-md5:\t"
+			elif [ -n "$USEDIGEST" ]; then
+				tag="BuildRequires:\tdigest(%SOURCE$srcno) = "
 			fi
 			md5=$(md5sum "$fp" | cut -f1 -d' ')
-			echo "Updating $tag ($md5: $fp)."
+			echo "Updating Source$srcno ($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+/;
+				print unless (/^\s*#\s*(No)?Source'$srcno'-md5\s*:/i or /^\s*BuildRequires:\s*digest\(%SOURCE'$srcno'\)/i);
+				print "'"$tag$md5"'\n" if /^Source'$srcno'\s*:\s+/;
 			' \
-			$SPECS_DIR/$SPECFILE
+			$PACKAGE_DIR/$SPECFILE
 		fi
 	done
 }
 
-check_md5()
-{
+check_md5() {
+	local bad
+	[ "$NO5" = "yes" ] && return
+
 	update_shell_title "check md5"
 
 	for i in "$@"; do
-		if good_md5 "$i" && good_size "$i"; then
-			continue
+		bad=0
+		if ! good_md5 "$i"; then
+			echo -n "MD5 sum mismatch."
+			bad=1
+		fi
+		if ! good_size "$i"; then
+			echo -n "0 sized file."
+			bad=1
 		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
+		if [ $bad -eq 1 ]; then
+			echo " 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
 }
 
-get_files()
-{
+get_files() {
 	update_shell_title "get_files"
 
 	if [ -n "$DEBUG" ]; then
@@ -914,7 +1028,7 @@ get_files()
 	fi
 
 	if [ $# -gt 0 ]; then
-		cd "$SOURCE_DIR"
+		cd "$PACKAGE_DIR"
 
 		if [ ! -s CVS/Root -a "$NOCVS" != "yes" ]; then
 			echo "Warning: No CVS access defined for SOURCES"
@@ -945,13 +1059,13 @@ get_files()
 				if echo $i | grep -vE '(http|ftp|https|cvs|svn)://' | grep -qE '\.(gz|bz2)$']; then
 					echo "Warning: no URL given for $i"
 				fi
+				target="$fp"
 
 				if [ -z "$NODIST" ] && [ -n "$srcmd5" ]; then
 					if good_md5 "$i" && good_size "$i"; then
 						echo "$fp having proper md5sum already exists"
 						continue
 					fi
-					target="$fp"
 
 					# optionally prefer mirror over distfiles if there's mirror
 					# TODO: build url list and then try each url from the list
@@ -995,7 +1109,7 @@ get_files()
 							${GETLOCAL} $url_attic $target
 						else
 							if [ -z "$NOMIRRORS" ]; then
-								url_attic="`find_mirror "$url_attic"`"
+								url_attic=$(find_mirror "$url_attic")
 							fi
 							update_shell_title "${GETURI%% *}: $url_attic"
 							${GETURI} ${OUTFILEOPT} "$target" "$url_attic" || \
@@ -1003,6 +1117,7 @@ get_files()
 								update_shell_title "${GETURI2%% *}: $url_attic"
 								${GETURI2} ${OUTFILEOPT} "$target" "$url_attic"
 							fi
+							test -s "$target" || rm -f "$target"
 						fi
 					fi
 
@@ -1024,16 +1139,17 @@ get_files()
 
 				if [ -z "$NOURLS" ] && [ ! -f "$fp" -o -n "$UPDATE" ] && [ "`echo $i | grep -E 'ftp://|http://|https://'`" ]; then
 					if [ -z "$NOMIRRORS" ]; then
-						im="`find_mirror "$i"`"
+						im=$(find_mirror "$i")
 					else
 						im="$i"
 					fi
 					update_shell_title "${GETURI%% *}: $im"
-					${GETURI} "$im" || \
+					${GETURI} "$im" ${OUTFILEOPT} "$target" || \
 					if [ "`echo $im | grep -E 'ftp://'`" ]; then
 						update_shell_title "${GETURI2%% *}: $im"
-						${GETURI2} "$im"
+						${GETURI2} "$im" ${OUTFILEOPT} "$target"
 					fi
+					test -s "$target" || rm -f "$target"
 				fi
 
 				if [ "$cvsup" = 1 ]; then
@@ -1085,7 +1201,7 @@ get_files()
 		fi
 
 		if [ "$CHMOD" = "yes" ]; then
-			CHMOD_FILES="`nourl "$@"`"
+			CHMOD_FILES=$(nourl "$@")
 			if [ -n "$CHMOD_FILES" ]; then
 				chmod $CHMOD_MODE $CHMOD_FILES
 			fi
@@ -1118,8 +1234,27 @@ make_tagver() {
 	echo -n "$TAGVER"
 }
 
-tag_files()
-{
+# bool is_tag_a_branch(tag)
+#
+# returns 1 if a tag is a branch set on SPECFILE
+is_tag_a_branch() {
+	if [ -n "$DEBUG" ]; then
+		set -x
+		set -v
+	fi
+
+	if [ $# -ne 1 ]; then
+		return 0;
+	fi
+
+	TAG=$1
+
+	cd "$PACKAGE_DIR"
+	$CVS_COMMAND status -v $SPECFILE | grep -Eiq "${TAG}.+(branch: [0-9.]+)"
+	return $?
+}
+
+tag_files() {
 	TAG_FILES="$@"
 
 	if [ -n "$DEBUG" ]; then
@@ -1144,7 +1279,19 @@ tag_files()
 		OPTIONS="-d $CVSROOT $OPTIONS"
 	fi
 
-	cd "$SOURCE_DIR"
+	# if a tagname we are about to set already exists
+	# and happens to be a branch (common case with AC-branch)
+	# pass -B (allows -F to disturb branch tag)
+	local _tag=$TAG
+	if [ "$TAG_VERSION" = "yes" ]; then
+		_tag=$TAGVER
+	fi;
+	is_tag_a_branch $_tag
+	if [ $? -eq 0 -a $CVS_NSERVER -eq 0 ]; then
+		OPTIONS="$OPTIONS -B"
+	fi;
+
+	cd "$PACKAGE_DIR"
 	local tag_files
 	for i in $TAG_FILES; do
 		# don't tag files stored on distfiles
@@ -1162,27 +1309,33 @@ tag_files()
 	if [ "$tag_files" ]; then
 		if [ "$TAG_VERSION" = "yes" ]; then
 			update_shell_title "tag sources: $TAGVER"
-			cvs $OPTIONS $TAGVER $tag_files || exit
+			printf "Tagging %d files\n" $(echo $tag_files | wc -w)
+			$CVS_COMMAND $OPTIONS $TAGVER $tag_files || exit
 		fi
 		if [ -n "$TAG" ]; then
 			update_shell_title "tag sources: $TAG"
-			cvs $OPTIONS $TAG $tag_files || exit
+
+			while [ "$tag_files" ]; do
+				local chunk=$(echo $tag_files | tr ' ' '\n' | head -n 100)
+				printf "Tagging %d files\n" $(echo $chunk | wc -w)
+				$CVS_COMMAND $OPTIONS $TAG $chunk || exit
+				tag_files=$(echo $tag_files | tr ' ' '\n' | tail +101)
+			done
 		fi
 	fi
 
-	cd "$SPECS_DIR"
+	cd "$PACKAGE_DIR"
 	if [ "$TAG_VERSION" = "yes" ]; then
 		update_shell_title "tag spec: $TAGVER"
-		cvs $OPTIONS $TAGVER $SPECFILE || exit
+		$CVS_COMMAND $OPTIONS $TAGVER $SPECFILE || exit
 	fi
 	if [ -n "$TAG" ]; then
 		update_shell_title "tag spec: $TAG"
-		cvs $OPTIONS $TAG $SPECFILE || exit
+		$CVS_COMMAND $OPTIONS $TAG $SPECFILE || exit
 	fi
 }
 
-branch_files()
-{
+branch_files() {
 	TAG=$1
 	echo "CVS branch tag: $TAG"
 	shift
@@ -1195,10 +1348,17 @@ branch_files()
 	fi
 
 	local OPTIONS="tag $CVS_FORCE -b"
+
+	# branch exists?
+	is_tag_a_branch $TAG
+	if [ $? -eq 1 ]; then
+		OPTIONS="$OPTIONS -B"
+	fi
+
 	if [ -n "$CVSROOT" ]; then
 		OPTIONS="-d $CVSROOT $OPTIONS"
 	fi
-	cd "$SOURCE_DIR"
+	cd "$PACKAGE_DIR"
 	local tag_files
 	for i in $TAG_FILES; do
 		local fp=`nourl "$i"`
@@ -1211,11 +1371,11 @@ branch_files()
 		fi
 	done
 	if [ "$tag_files" ]; then
-		cvs $OPTIONS $TAG $tag_files || exit
+		$CVS_COMMAND $OPTIONS $TAG $tag_files || exit
 	fi
 
-	cd "$SPECS_DIR"
-	cvs $OPTIONS $TAG $SPECFILE || exit
+	cd "$PACKAGE_DIR"
+	$CVS_COMMAND $OPTIONS $TAG $SPECFILE || exit
 }
 
 
@@ -1231,44 +1391,63 @@ check_buildarch() {
 	fi
 }
 
+# from relup.sh
+set_release() {
+	local specfile="$1"
+	local rel="$2"
+	local newrel="$3"
+	sed -i -e "
+		s/^\(%define[ \t]\+_\?rel[ \t]\+\)$rel\$/\1$newrel/
+		s/^\(Release:[ \t]\+\)$rel\$/\1$newrel/
+	" $specfile
+}
+
+set_version() {
+	local specfile="$1"
+	local ver="$2"
+	local newver="$3"
+	sed -i -e "
+		s/^\(%define[ \t]\+_\?ver[ \t]\+\)$ver\$/\1$newver/
+		s/^\(Version:[ \t]\+\)$ver\$/\1$newver/
+	" $specfile
+}
 
-build_package()
-{
+build_package() {
 	update_shell_title "build_package"
 	if [ -n "$DEBUG" ]; then
 		set -x
 		set -v
 	fi
 
-	cd "$SPECS_DIR"
+	cd "$PACKAGE_DIR"
 
 	if [ -n "$TRY_UPGRADE" ]; then
+		local TNOTIFY TNEWVER TOLDVER
 		update_shell_title "build_package: try_upgrade"
+
 		if [ -n "$FLOAT_VERSION" ]; then
-			TNOTIFY=`./pldnotify.awk $SPECFILE -n` || exit 1
+			TNOTIFY=$($APPDIR/pldnotify.awk ${BE_VERBOSE:+-vDEBUG=1} $SPECFILE -n) || exit 1
 		else
-			TNOTIFY=`./pldnotify.awk $SPECFILE` || exit 1
+			TNOTIFY=$($APPDIR/pldnotify.awk ${BE_VERBOSE:+-vDEBUG=1} $SPECFILE) || exit 1
 		fi
 
-		TNEWVER=`echo $TNOTIFY | awk '{ match($4,/\[NEW\]/); print $5 }'`
+		TNEWVER=$(echo $TNOTIFY | awk '{ match($4,/\[NEW\]/); print $5 }')
 
 		if [ -n "$TNEWVER" ]; then
 			TOLDVER=`echo $TNOTIFY | awk '{ print $3; }'`
-			echo "New version found, updating spec file to version " $TNEWVER
+			echo "New version found, updating spec file from $TOLDVER to version $TNEWVER"
 			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"
+			set_release $SPECFILE $PACKAGE_RELEASE 0.1
+			set_version $SPECFILE $PACKAGE_VERSION $TNEWVER
 			parse_spec
 			NODIST="yes" get_files $SOURCES $PATCHES
 			update_md5 $SOURCES
-
-			unset TOLDVER TNEWVER TNOTIFY
 		fi
 	fi
-	cd "$SPECS_DIR"
+	cd "$PACKAGE_DIR"
 
 	case "$COMMAND" in
 		build )
@@ -1299,8 +1478,9 @@ build_package()
 		if [ -n "$LASTLOG_FILE" ]; then
 			echo "LASTLOG=$LOG" > $LASTLOG_FILE
 		fi
-		RES_FILE=~/tmp/$RPMBUILD-exit-status.$RANDOM
-		(time eval ${NICE_COMMAND} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND $TARGET_SWITCH $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
+		RES_FILE=$(mktemp -t builder.XXXXXX || ${TMPDIR:-/tmp}/builder.$RANDOM)
+
+		(time eval ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
 		RETVAL=`cat $RES_FILE`
 		rm $RES_FILE
 		if [ -n "$LOGDIROK" ] && [ -n "$LOGDIRFAIL" ]; then
@@ -1311,7 +1491,7 @@ build_package()
 			fi
 		fi
 	else
-		eval ${NICE_COMMAND} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND $TARGET_SWITCH $SPECFILE
+		eval ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $SPECFILE
 		RETVAL=$?
 	fi
 	if [ "$RETVAL" -ne "0" ]; then
@@ -1326,31 +1506,23 @@ build_package()
 	unset BUILD_SWITCH
 }
 
-nourl()
-{
+nourl() {
 	echo "$@" | sed 's#\<\(ftp\|http\|https\|cvs\|svn\)://[^ ]*/##g'
 }
 
-install_required_packages()
-{
+install_required_packages() {
 	run_poldek -vi $1
 	return $?
 }
 
-find_spec_bcond() {
-	# taken from find-spec-bcond, but with just getting the list
+find_spec_bcond() { # originally from /usr/lib/rpm/find-spec-bcond
 	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);
+		bcond = substr($0, RSTART + 6, RLENGTH - 6);
+		gsub(/[ \t]+/, "_", bcond);
 		print bcond
 	}' $SPEC | LC_ALL=C sort -u
 }
@@ -1404,17 +1576,18 @@ process_bcondrc() {
 	update_shell_title "parse ~/.bcondrc: DONE!"
 }
 
-set_bconds_values()
-{
+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
+
+	if egrep -q '^# *_with' ${SPECFILE}; then
+		echo >&2 "ERROR: This spec has old style bconds."
+		exit 1
+	fi
+
+	if ! grep -q '^%bcond' ${SPECFILE}; then
 		return
 	fi
 
@@ -1422,88 +1595,41 @@ set_bconds_values()
 	process_bcondrc "$SPECFILE"
 
 	update_shell_title "parse bconds"
-	case "${BCOND_VERSION}" in
-		NONE)
-			:
-			;;
-		OLD)
-			echo "Warning: This spec has old style bconds. Fix it || die."
-			for opt in `echo "$bcond_avail" | grep ^_without_`
-			do
-				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 `echo "$bcond_avail" | grep ^_with_`
-			do
-				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"
-				fi
-			done
+	local opt bcond
+	for opt in $bcond_avail; do
+		case "$opt" in
+		without_*)
+			bcond=${opt#without_}
+			case "$BCOND" in
+			*--without?${bcond}*)
+				AVAIL_BCONDS_WITHOUT="$AVAIL_BCONDS_WITHOUT <$bcond>"
+				;;
+			*)
+				AVAIL_BCONDS_WITHOUT="$AVAIL_BCONDS_WITHOUT $bcond"
+				;;
+			esac
 			;;
-		NEW)
-			local cond_type="" # with || without
-			for opt in $bcond_avail; do
-				case "$opt" in
-					_without)
-						cond_type="without"
-						;;
-					_with)
-						cond_type="with"
-						;;
-					_without_*)
-						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=${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"
-						fi
-						;;
-					*)
-						case "$cond_type" in
-							with)
-								cond_type=''
-								AVAIL_BCOND_WITH="$opt"
-								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"
-								fi
-								;;
-							without)
-								cond_type=''
-								AVAIL_BCOND_WITHOUT="$opt"
-								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
-								;;
-						esac
-						;;
-				esac
-			done
+		with_*)
+			bcond=${opt#with_}
+			case "$BCOND" in
+			*--with?${bcond}*)
+				AVAIL_BCONDS_WITH="$AVAIL_BCONDS_WITH <$bcond>"
+				;;
+			*)
+				AVAIL_BCONDS_WITH="$AVAIL_BCONDS_WITH $bcond"
+				;;
+			esac
 			;;
-	esac
+		*)
+			echo >&2 "ERROR: unexpected '$opt' in set_bconds_values"
+			exit 1
+			;;
+		esac
+	done
 }
 
-run_sub_builder()
-{
+run_sub_builder() {
 	package_name="${1}"
 	update_shell_title "run_sub_builder $package_name"
 	#
@@ -1517,17 +1643,17 @@ run_sub_builder()
 	#
 	#
 	# y0shi.
+	# kurwa. translate that ^^^^
 
 	parent_spec_name=''
 
 	# Istnieje taki spec? ${package}.spec
-	if [ -f "${SPECS_DIR}/${package}.spec" ]; then
+	if [ -f "${PACKAGE_DIR}/${package}.spec" ]; then
 		parent_spec_name=${package}.spec
-	elif [ -f "${SPECS_DIR}/`echo ${package_name} | sed -e s,-devel.*,,g -e s,-static,,g`.spec" ]; then
-		parent_spec_name="`echo ${package_name} | sed -e s,-devel.*,,g -e s,-static,,g`.spec"
+	elif [ -f "${PACKAGE_DIR}/$(echo ${package_name} | sed -e s,-devel.*,,g -e s,-static,,g).spec" ]; then
+		parent_spec_name="$(echo ${package_name} | sed -e s,-devel.*,,g -e s,-static,,g).spec"
 	else
-		for provides_line in `grep ^Provides:.*$package  ${SPECS_DIR} -R`
-		do
+		for provides_line in $(grep -r ^Provides:.*$package ${PACKAGE_DIR}); do
 			echo $provides_line
 		done
 	fi
@@ -1538,8 +1664,7 @@ run_sub_builder()
 	NOT_INSTALLED_PACKAGES="$NOT_INSTALLED_PACKAGES $package_name"
 }
 
-spawn_sub_builder()
-{
+spawn_sub_builder() {
 	package_name="${1}"
 	update_shell_title "spawn_sub_builder $package_name"
 
@@ -1556,12 +1681,11 @@ spawn_sub_builder()
 		sub_builder_opts="${sub_builder_opts} -Upi"
 	fi
 
-	cd "${SPECS_DIR}"
+	cd "${PACKAGE_DIR}"
 	./builder ${sub_builder_opts} "$@"
 }
 
-remove_build_requires()
-{
+remove_build_requires() {
 	if [ "$INSTALLED_PACKAGES" != "" ]; then
 		case "$REMOVE_BUILD_REQUIRES" in
 			"force")
@@ -1573,48 +1697,50 @@ remove_build_requires()
 			*)
 				echo You may want to manually remove following BuildRequires fetched:
 				echo $INSTALLED_PACKAGES
-				echo Try poldek -e \`cat `pwd`/.${SPECFILE}_INSTALLED_PACKAGES\`
+				echo "Try poldek -e \`cat $(pwd)/.${SPECFILE}_INSTALLED_PACKAGES\`"
 				;;
 		esac
 	fi
 }
 
-display_bconds()
-{
-	if [ "$AVAIL_BCONDS_WITH" != "" ] || [ "$AVAIL_BCONDS_WITHOUT" != "" ]; then
-		if [ "$BCOND" != "" ]; then
-			echo -ne "\nBuilding $SPECFILE with the following conditional flags:\n"
-			echo -ne "$BCOND"
+display_bconds() {
+	if [ "$AVAIL_BCONDS_WITH" -o "$AVAIL_BCONDS_WITHOUT" ]; then
+		if [ "$BCOND" ]; then
+			echo ""
+			echo "Building $SPECFILE with the following conditional flags:"
+			echo -n "$BCOND"
 		else
-			echo -ne "\nNo conditional flags passed"
+			echo ""
+			echo "No conditional flags passed"
 		fi
-		echo -ne "\n\nfrom available:\n"
-		echo -ne "--with   :\t$AVAIL_BCONDS_WITH\n--without:\t$AVAIL_BCONDS_WITHOUT\n\n"
+		echo ""
+		echo "from available:"
+		echo "--with   :\t$AVAIL_BCONDS_WITH"
+		echo "--without:\t$AVAIL_BCONDS_WITHOUT"
+		echo ""
 	fi
 }
 
-display_branches()
-{
+display_branches() {
 	if [ "$NOCVSSPEC" != "yes" ]; then
-		echo -ne "Available branches: "
-		cvs status -v "${SPECFILE}" | awk '!/Sticky Tag:/ && /\(branch:/ { print $1 } ' | xargs
+		echo -n "Available branches: "
+		$CVS_COMMAND status -v "${SPECFILE}" | awk '!/Sticky Tag:/ && /\(branch:/ { print $1 } ' | xargs
 	fi
 }
 
 # checks a given list of packages/files/provides agains current rpmdb.
-# outputs all dependencies whcih current rpmdb doesn't satisfy.
+# outputs all dependencies which current rpmdb doesn't satisfy.
 # input can be either STDIN or parameters
-_rpm_prov_check()
-{
+_rpm_prov_check() {
 	local DEPS
 
-	if [ "$#" -gt 0 ]; then
+	if [ $# -gt 0 ]; then
 		DEPS="$@"
 	else
 		DEPS=$(cat)
 	fi
 
-	DEPS=$(rpm -q --whatprovides $DEPS 2>&1 | awk '/^(error:|no package provides)/ { print }')
+	DEPS=$(LANG=C rpm -q --whatprovides $DEPS 2>&1 | awk '/^(error:|no package provides)/ { print }')
 
 	# packages
 	echo "$DEPS" | awk '/^no package provides/ { print $NF }'
@@ -1624,74 +1750,89 @@ _rpm_prov_check()
 }
 
 # checks if given package/files/provides exists in rpmdb.
-# inout can be either stdin or parameters
-# returns packages wchi hare present in the rpmdb
-_rpm_cnfl_check()
-{
+# input can be either stdin or parameters
+# returns packages which are present in the rpmdb
+_rpm_cnfl_check() {
 	local DEPS
 
-	if [ "$#" -gt 0 ]; then
+	if [ $# -gt 0 ]; then
 		DEPS="$@"
 	else
 		DEPS=$(cat)
 	fi
 
-	rpm -q --whatprovides $DEPS 2>/dev/null | awk '!/no package provides/ { print }'
+	LANG=C rpm -q --whatprovides $DEPS 2>/dev/null | awk '!/no package provides/ { print }'
+}
+
+# install deps via information from 'rpm-getdeps' or 'rpm --specsrpm'
+install_build_requires_rpmdeps() {
+	if [ "$FETCH_BUILD_REQUIRES_RPMGETDEPS" = "yes" ]; then
+		# TODO: Conflicts list doesn't check versions
+		local CNFL=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^\-/ { print $3 } ' | _rpm_cnfl_check | xargs)
+		local DEPS=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^\+/ { print $3 } ' | _rpm_prov_check | xargs)
+	fi
+	if [ "$FETCH_BUILD_REQUIRES_RPMSPECSRPM" = "yes" ]; then
+		local CNFL=$(rpm -q --specsrpm --conflicts $BCOND $SPECFILE | awk '{print $1}' | _rpm_cnfl_check | xargs)
+		local DEPS=$(rpm -q --specsrpm --requires $BCOND $SPECFILE | awk '{print $1}' | _rpm_prov_check | xargs)
+	fi
+
+	if [ -n "$CNFL" ] || [ -n "$DEPS" ]; then
+		echo "fetch BuildRequires: install [$DEPS]; remove [$CNFL]"
+		update_shell_title "poldek: install [$DEPS]; remove [$CNFL]"
+		$SU_SUDO /usr/bin/poldek -q --update || $SU_SUDO /usr/bin/poldek -q --upa
+	fi
+	if [ -n "$CNFL" ]; then
+		update_shell_title "uninstall conflicting packages: $CNFL"
+		echo "Trying to uninstall conflicting packages ($CNFL):"
+		$SU_SUDO /usr/bin/poldek --noask --nofollow -ev $CNFL
+	fi
+
+	while [ "$DEPS" ]; do
+			update_shell_title "install deps: $DEPS"
+			echo "Trying to install dependencies ($DEPS):"
+			local log=.${SPECFILE}_poldek.log
+			LANG=C $SU_SUDO /usr/bin/poldek --noask --caplookup -uGqQ $DEPS | tee $log
+			failed=$(awk '/^error:/{a=$2; sub(/^error: /, "", a); sub(/:$/, "", a); print a}' $log)
+			rm -f $log
+			local ok
+			if [ -n "$failed" ]; then
+				for package in $failed; do
+					spawn_sub_builder -bb $(depspecname $package) && ok="$ok $package"
+				done
+				DEPS="$ok"
+			else
+				DEPS=""
+			fi
+	done
 }
 
 fetch_build_requires()
 {
-	if [ "${FETCH_BUILD_REQUIRES}" = "yes" ]; then
-		update_shell_title "fetch build requires"
-		if [ "$FETCH_BUILD_REQUIRES_RPMGETDEPS" = "yes" ]; then
-			# TODO: Conflicts list doesn't check versions
-			local CNFL=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^\-/ { print $3 } ' | _rpm_cnfl_check | xargs)
-			local DEPS=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^\+/ { print $3 } ' | _rpm_prov_check | xargs)
-
-			if [ -n "$CNFL" ] || [ -n "$DEPS" ]; then
-				echo "fetch builderequires: install [$DEPS]; remove [$CNFL]"
-				update_shell_title "poldek: install [$DEPS]; remove [$CNFL]"
-				$SU_SUDO /usr/bin/poldek -q --update || $SU_SUDO /usr/bin/poldek -q --upa
-			fi
-			if [ -n "$CNFL" ]; then
-				update_shell_title "uninstall conflicting packages: $CNFL"
-				echo "Trying to uninstall conflicting packages ($CNFL):"
-				$SU_SUDO /usr/bin/poldek --noask --nofollow -ev $CNFL
-			fi
+	if [ "${FETCH_BUILD_REQUIRES}" != "yes" ]; then
+		return
+	fi
 
-			while [ "$DEPS" ]; do
-					update_shell_title "install deps: $DEPS"
-					echo "Trying to install dependencies ($DEPS):"
-					local log=.${SPECFILE}_poldek.log
-					$SU_SUDO /usr/bin/poldek --caplookup -uGq $DEPS | tee $log
-					failed=$(awk -F: '/^error:/{print $2}' $log)
-					rm -f $log
-					local ok
-					if [ -n "$failed" ]; then
-						for package in $failed; do
-							# FIXME: sanitise, deps could be not .spec files
-							spawn_sub_builder -bb $package && ok="$ok $package"
-						done
-						DEPS="$ok"
-					else
-						DEPS=""
-					fi
-			done
-			return
-		fi
+	update_shell_title "fetch build requires"
+	if [ "$FETCH_BUILD_REQUIRES_RPMGETDEPS" = "yes" ] || [ "$FETCH_BUILD_REQUIRES_RPMSPECSRPM" = "yes" ]; then
+		install_build_requires_rpmdeps
+		return
+	fi
 
-		echo -ne "\nAll packages installed by fetch_build_requires() are written to:\n"
-		echo -ne "`pwd`/.${SPECFILE}_INSTALLED_PACKAGES\n"
-		echo -ne "\nIf anything fails, you may get rid of them by executing:\n"
-		echo "poldek -e \`cat `pwd`/.${SPECFILE}_INSTALLED_PACKAGES\`\n\n"
+		# XXX is this ugliest code written in human history still needed?
+		echo "All packages installed by fetch_build_requires() are written to:"
+		echo "`pwd`/.${SPECFILE}_INSTALLED_PACKAGES"
+		echo ""
+		echo "If anything fails, you may get rid of them by executing:"
+		echo "poldek -e \`cat `pwd`/.${SPECFILE}_INSTALLED_PACKAGES\`"
+		echo ""
 		echo > `pwd`/.${SPECFILE}_INSTALLED_PACKAGES
-		for package_item in `cat $SPECFILE|grep -B100000 ^%changelog|grep -v ^#|grep BuildRequires|grep -v ^-|sed -e "s/^.*BuildRequires://g"|awk '{print $1}'|sed -e s,perl\(,perl-,g -e s,::,-,g -e s,\(.*\),,g -e s,%{,,g -e s,},,g|grep -v OpenGL-devel|sed -e s,sh-utils,coreutils,g -e s,fileutils,coreutils,g -e s,textutils,coreutils,g -e s,kgcc_package,gcc,g -e s,\),,g`
+		for package_item in $(cat $SPECFILE | grep -B100000 ^%changelog|grep -v ^#|grep BuildRequires|grep -v ^-|sed -e "s/^.*BuildRequires://g"|awk '{print $1}'|sed -e s,perl\(,perl-,g -e s,::,-,g -e s,\(.*\),,g -e s,%{,,g -e s,},,g|grep -v OpenGL-devel|sed -e s,sh-utils,coreutils,g -e s,fileutils,coreutils,g -e s,textutils,coreutils,g -e s,kgcc_package,gcc,g -e s,\),,g)
 		do
-			package_item="`echo $package_item|sed -e s,rpmbuild,rpm-build,g |sed -e s,__perl,perl,g |sed -e s,gasp,binutils-gasp,g -e s,binutils-binutils,binutils,g -e s,apxs,apache,g|sed -e s,apache\(EAPI\)-devel,apache-devel,g -e s,kernel-headers\(netfilter\),kernel-headers,g -e s,awk,mawk,g -e s,mmawk,mawk,g -e s,motif,openmotif,g -e s,openopenmotif,openmotif,g`"
+			package_item=$(echo $package_item|sed -e s,rpmbuild,rpm-build,g |sed -e s,__perl,perl,g |sed -e s,gasp,binutils-gasp,g -e s,binutils-binutils,binutils,g -e s,apxs,apache,g|sed -e s,apache\(EAPI\)-devel,apache-devel,g -e s,kernel-headers\(netfilter\),kernel-headers,g -e s,awk,mawk,g -e s,mmawk,mawk,g -e s,motif,openmotif,g -e s,openopenmotif,openmotif,g)
 			GO="yes"
-			package=`basename "$package_item"|sed -e "s/}$//g"`
-			COND_ARCH_TST="`cat $SPECFILE|grep -B1 BuildRequires|grep -B1 $package|grep ifarch|sed -e "s/^.*ifarch//g"`"
-			mach=`uname -m`
+			package=$(basename "$package_item"|sed -e "s/}$//g")
+			COND_ARCH_TST=$(cat $SPECFILE|grep -B1 BuildRequires|grep -B1 $package|grep ifarch|sed -e "s/^.*ifarch//g")
+			mach=$(uname -m)
 
 			COND_TST=`cat $SPECFILE|grep BuildRequires|grep "$package"`
 			if `echo $COND_TST|grep -q '^BuildRequires:'`; then
@@ -1756,11 +1897,11 @@ fetch_build_requires()
 						for package_name in `cat ".$package-req.txt"|grep -v ^#`
 						do
 							if [ "$package_name" = "$package" ]; then
-								echo -ne "Installing BuildRequired package:\t$package_name\n"
+								echo "Installing BuildRequired package:\t$package_name"
 								update_shell_title "Installing BuildRequired package: ${package_name}"
 								install_required_packages $package
 							else
-								echo -ne "Installing (sub)Required package:\t$package_name\n"
+								echo "Installing (sub)Required package:\t$package_name"
 								update_shell_title "Installing (sub)Required package: ${package_name}"
 								install_required_packages $package_name
 							fi
@@ -1771,7 +1912,7 @@ fetch_build_requires()
 									;;
 								*)
 									echo "Attempting to run spawn sub - builder..."
-									echo -ne "Package installation failed:\t$package_name\n"
+									echo "Package installation failed:\t$package_name"
 									run_sub_builder $package_name
 									if [ $? -eq 0 ]; then
 										install_required_packages $package_name
@@ -1791,7 +1932,7 @@ fetch_build_requires()
 						rm -f ".$package-req.txt"
 					else
 						echo "Attempting to run spawn sub - builder..."
-						echo -ne "Package installation failed:\t$package\n"
+						echo "Package installation failed:\t$package"
 						run_sub_builder $package
 						if [ $? -eq 0 ]; then
 							install_required_packages $package
@@ -1812,7 +1953,7 @@ fetch_build_requires()
 			fi
 		done
 		if [ "$NOT_INSTALLED_PACKAGES" != "" ]; then
-			echo "Unable to install following packages and their dependencies:"
+			echo >&2 "Unable to install following packages and their dependencies:"
 			for pkg in "$NOT_INSTALLED_PACKAGES"
 			do
 				echo $pkg
@@ -1820,28 +1961,28 @@ fetch_build_requires()
 			remove_build_requires
 			exit 8
 		fi
-	fi
 }
 
 init_rpm_dir() {
-
-	TOP_DIR="`eval $RPM $RPMOPTS --eval '%{_topdir}'`"
+	TOP_DIR=$(eval $RPM $RPMOPTS --eval '%{_topdir}')
 	CVSROOT=":pserver:cvs@$CVS_SERVER:/cvsroot"
 
+	echo "Initializing rpm directories to $TOP_DIR from $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,compile,repackage}.sh}
+	$CVS_COMMAND -d $CVSROOT co packages/{.cvsignore,rpm.groups,dropin,mirrors,md5,adapter{,.awk},fetchsrc_request,builder,{relup,compile,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 "To checkout *all* .spec files (read-only):"
+	echo "- run cvs co SPECS"
+
+	echo "To checkout *all* packages:"
+	echo "- run cvs up -dP in $TOP_DIR/packages dir"
 
 	echo ""
 	echo "To commit with your developer account:"
-	echo "- edit $SPECS_DIR/CVS/Root"
-	echo "- edit $SOURCE_DIR/CVS/Root"
+	echo "- edit $TOP_DIR/packages/CVS/Root"
 }
 
 get_greed_sources() {
@@ -1849,11 +1990,41 @@ get_greed_sources() {
 	if [ -n "BE_VERBOSE" ]; then
 		echo "Try greed download: $1 from: $CVSROOT"
 	fi
-	cvs -d $CVSROOT get SOURCES/$1
+	$CVS_COMMAND -d $CVSROOT get SOURCES/$1
 	if [ $? != 0 ]; then
 		Exit_error err_no_source_in_repo $1
 	fi
-	
+
+}
+
+# remove entries from CVS/Entries
+cvs_entry_remove() {
+	local cvsdir="$1"; shift
+	if [ ! -d "$cvsdir" ]; then
+		echo >&2 "cvs_entry_remove: $cvsdir is not a directory"
+		exit 1
+	fi
+
+	for file in "$@"; do
+		rm -f $cvsdir/CVS/Entries.new || return 1
+		awk -ve="${file##*/}" -F/ '$2 != e {print}' $cvsdir/CVS/Entries > $cvsdir/CVS/Entries.new || return 1
+		mv -f $cvsdir/CVS/Entries.new $cvsdir/CVS/Entries || return 1
+	done
+	return 0
+}
+
+mr_proper() {
+	init_builder
+	NOCVSSPEC="yes"
+	DONT_PRINT_REVISION="yes"
+	get_spec
+	parse_spec
+
+	# remove from CVS/Entries
+	cvs_entry_remove $PACKAGE_DIR $SPECFILE $SOURCES $PATCHES
+
+	# remove spec and sources
+	$RPMBUILD --clean --rmsource --rmspec --nodeps --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $SPECFILE
 }
 
 #---------------------------------------------
@@ -1906,7 +2077,7 @@ while [ $# -gt 0 ]; do
 		-B | --branch )
 			COMMAND="branch"; shift; TAG="${1}"; shift;;
 		-c | --clean )
-			CLEAN="--clean --rmspec --rmsource"; shift ;;
+			CLEAN="--clean"; shift ;;
 		-cf | --cvs-force )
 			CVS_FORCE="-F"; shift;;
 		-d | --cvsroot )
@@ -1958,11 +2129,16 @@ while [ $# -gt 0 ]; do
 			shift; RPMOPTS="${RPMOPTS} ${1}"; shift ;;
 		--nopatch | -np )
 			shift; RPMOPTS="${RPMOPTS} --define \"patch${1} : ignoring patch${1}; exit 1; \""; shift ;;
+		--topdir)
+			RPMOPTS="${RPMOPTS} --define \"_topdir $2\""
+			shift 2
+			;;
 		--with | --without )
 			case $GROUP_BCONDS in
 				"yes")
 					COND=${1}
 					shift
+					# XXX: broken: ./builder -bb ucspi-tcp.spec --without mysql
 					while ! `echo ${1}|grep -qE '(^-|spec)'`
 					do
 						BCOND="$BCOND $COND $1"
@@ -1988,9 +2164,13 @@ while [ $# -gt 0 ]; do
 		--date )
 			CVSDATE="${2}"; shift 2 ;;
 		-r | --cvstag )
-			shift; CVSTAG="${1}"; shift ;;
+			CVSTAG="$2"
+		   	shift 2
+		   	;;
 		-A)
-			shift; CVSTAG="HEAD"; ;;
+			shift
+			CVSTAG="HEAD"
+		   	;;
 		-R | --fetch-build-requires)
 			FETCH_BUILD_REQUIRES="yes"
 			NOT_INSTALLED_PACKAGES=
@@ -2082,6 +2262,11 @@ while [ $# -gt 0 ]; do
 				RPMOPTS="${RPMOPTS} --define \"${MACRO} ${VALUE}\""
 			fi
 			;;
+		--alt_kernel)
+			shift
+			RPMOPTS="${RPMOPTS} --define \"alt_kernel $1\""
+			shift
+			;;
 		--short-circuit)
 			RPMBUILDOPTS="${RPMBUILDOPTS} --short-circuit"
 			shift
@@ -2094,6 +2279,10 @@ while [ $# -gt 0 ]; do
 			COMMAND="show_bcond_args"
 			shift
 			;;
+		--show-avail-bconds)
+			COMMAND="show_avail_bconds"
+			shift
+			;;
 		--nodeps)
 			shift
 			RPMOPTS="${RPMOPTS} --nodeps"
@@ -2101,31 +2290,38 @@ while [ $# -gt 0 ]; do
 		-debug)
 			RPMBUILDOPTS="${RPMBUILDOPTS} -debug"; shift
 			;;
-		-* )
+		-*)
 			Exit_error err_invalid_cmdline "$1"
 			;;
-		* )
-			SPECFILE="${1}"
+		*)
+			SPECFILE=$1; shift
 			# check if specname was passed as specname:cvstag
 			if [ "${SPECFILE##*:}" != "${SPECFILE}" ]; then
 				CVSTAG="${SPECFILE##*:}"
 				SPECFILE="${SPECFILE%%:*}"
 			fi
-			ASSUMED_NAME="$(basename ${SPECFILE%%.spec})"
-			shift
+			# always have SPECFILE ending with .spec extension
+			SPECFILE=${SPECFILE%%.spec}.spec
+			ASSUMED_NAME=$(basename ${SPECFILE%%.spec})
 	esac
 done
 
-if [ -f CVS/Entries ] && [ -z "$CVSTAG" ]; then
-	CVSTAG=$(awk -vSPECFILE="${SPECFILE%.spec}.spec" -F/ '$2 == SPECFILE && $6 ~ /^T/{print substr($6, 2)}' CVS/Entries)
+[ -d "$ASSUMED_NAME" ] && CVS_ENTRIES="$ASSUMED_NAME/CVS/Entries" || CVS_ENTRIES="CVS/Entries"
+if [ -f "$CVS_ENTRIES" ] && [ -z "$CVSTAG" ]; then
+	CVSTAG=$(awk -vSPECFILE=$(basename $SPECFILE) -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."
+		echo >&2 "builder: Sticky tag $CVSTAG active. Use -r TAGNAME to override."
 	fi
 elif [ "$CVSTAG" = "HEAD" ]; then
 	# assume -r HEAD is same as -A
 	CVSTAG=""
 fi
 
+if [ "$CVSTAG" ]; then
+	# pass $CVSTAG used by builder to rpmbuild too, so specs could use it
+	RPMOPTS="$RPMOPTS --define \"_cvstag $CVSTAG\""
+fi
+
 if [ -n "$DEBUG" ]; then
 	set -x
 	set -v
@@ -2165,10 +2361,43 @@ case "$COMMAND" in
 			set_bconds_values
 			echo "$BCOND"
 		fi
+		;;
+	"show_avail_bconds")
+		init_builder
+		if [ -n "$SPECFILE" ]; then
+			get_spec > /dev/null
+			parse_spec
+			local bcond_avail=$(find_spec_bcond $SPECFILE)
+			local opt bcond bconds
+			for opt in $bcond_avail; do
+				case "$opt" in
+				without_*)
+					bcond=${opt#without_}
+					bconds="$bconds $bcond"
+					;;
+				with_*)
+					bcond=${opt#with_}
+					bconds="$bconds $bcond"
+					;;
+				*)
+					echo >&2 "ERROR: unexpected '$opt' in show_avail_bconds"
+					exit 1
+					;;
+				esac
+			done
+			echo $bconds
+		fi
+
 		;;
 	"build" | "build-binary" | "build-source" | "build-prep" | "build-build" | "build-install" | "build-list")
 		init_builder
 		if [ -n "$SPECFILE" ]; then
+			# display SMP make flags if set
+			smp_mflags=$(rpm -E %{?_smp_mflags})
+			if [ "$smp_mflags" ]; then
+				echo "builder: SMP make flags are set to $smp_mflags"
+			fi
+
 			get_spec
 			parse_spec
 			set_bconds_values
@@ -2187,18 +2416,9 @@ case "$COMMAND" in
 
 			# ./builder -bs test.spec -r AC-branch -Tp auto-ac- -tt
 			if [ -n "$TEST_TAG" ]; then
-				# - do not allow utf8 encoded specs on AC-branch
-				if [ "$CVSTAG" = "AC-branch-disabled" ]; then
-					local t
-					t=$(grep '^Summary(.*\.UTF-8):' $SPECFILE)
-					if [ "$t" ]; then
-						Exit_error err_acl_deny "UTF-8 .specs not allowed on $CVSTAG"
-					fi
-				fi
-
 				local TAGVER=`make_tagver`
 				echo "Searching for tag $TAGVER..."
-				TAGREL=$(cvs status -v $SPECFILE | grep -E "^[[:space:]]*${TAGVER}[[[:space:]]" | sed -e 's#.*(revision: ##g' -e 's#).*##g')
+				TAGREL=$($CVS_COMMAND status -v $SPECFILE | grep -E "^[[:space:]]*${TAGVER}[[[:space:]]" | sed -e 's#.*(revision: ##g' -e 's#).*##g')
 				if [ -n "$TAGREL" ]; then
 					Exit_error err_tag_exists "$TAGVER" "$TAGREL"
 				fi
@@ -2207,7 +2427,7 @@ case "$COMMAND" in
 				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.]+)")
+					TAG_STATUS=$($CVS_COMMAND 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
@@ -2300,7 +2520,7 @@ case "$COMMAND" in
 		fi
 		;;
 	"mr-proper" )
-		$RPM --clean --rmsource --rmspec --force --nodeps $SPECFILE
+		mr_proper
 		;;
 	"list-sources-files" )
 		init_builder
@@ -2330,7 +2550,7 @@ case "$COMMAND" in
 		get_spec
 		parse_spec
 		for SAP in $SOURCES $PATCHES; do
-			echo $SOURCE_DIR/$(echo $SAP | awk '{gsub(/.*\//,"") ; print }')
+			echo $PACKAGE_DIR/$(echo $SAP | awk '{gsub(/.*\//,"") ; print }')
 		done
 		;;
 	"list-sources-distfiles-paths" )