X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=builder;h=91141c490b74a47eaa13516353b5d2dadc3e5362;hp=795fffe2fb33e40011ef7712a7cf33104bcd511a;hb=c940d7763dbbadc077c4d8cba3a00f8d69f1f4bb;hpb=3d1aed15544d448e75305e1a92230f8607a68230

diff --git a/builder b/builder
index 795fffe..91141c4 100644
--- a/builder
+++ b/builder
@@ -1,6 +1,9 @@
 #!/bin/ksh
+#
+# This program is free software, distributed under the terms of
+# the GNU General Public License Version 2.
+#
 # -----------
-# $Id$
 # Exit codes:
 #	  0 - succesful
 #	  1 - help displayed
@@ -20,9 +23,14 @@
 #	- when Icon: field is present, -5 and -a5 doesn't work
 #	- builder -R skips installing BR if spec is not present before builder invocation (need to run builder twice)
 
-VERSION="\
+RCSID='$Id$'
+r=${RCSID#* * }
+rev=${r%% *}
+VERSION="v0.21/$rev"
+VERSIONSTRING="\
 Build package utility from PLD Linux CVS repository
-v0.18 (C) 1999-2007 Free Penguins".
+$VERSION (C) 1999-2007 Free Penguins".
+
 PATH="/bin:/usr/bin:/usr/sbin:/sbin:/usr/X11R6/bin"
 
 COMMAND="build"
@@ -38,11 +46,19 @@ NOCVS=""
 NOCVSSPEC=""
 NODIST=""
 NOINIT=""
+PREFMIRRORS=""
 UPDATE=""
 ADD5=""
 NO5=""
 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)"
 
 # It can be used i.e. in log file naming.
 # See LOGFILE example.
@@ -72,6 +88,7 @@ ICONS=""
 PACKAGE_RELEASE=""
 PACKAGE_VERSION=""
 PACKAGE_NAME=""
+ASSUMED_NAME=""
 PROTOCOL="ftp"
 WGET_RETRIES=${MAX_WGET_RETRIES:-0}
 CVS_RETRIES=${MAX_CVS_RETRIES:-1000}
@@ -96,12 +113,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.
@@ -123,8 +147,10 @@ fi
 SU_SUDO=""
 if [ -n "$HOME_ETC" ]; then
 	USER_CFG="$HOME_ETC/.builderrc"
+	BUILDER_MACROS="$HOME_ETC/.builder-rpmmacros"
 else
 	USER_CFG=~/.builderrc
+	BUILDER_MACROS=~/.builder-rpmmacros
 fi
 
 [ -f "$USER_CFG" ] && . "$USER_CFG"
@@ -149,6 +175,7 @@ else
 	wget --help 2>&1 | grep -q -- ' --no-check-certificate ' && WGET_OPTS="$WGET_OPTS --no-check-certificate"
 	wget --help 2>&1 | grep -q -- ' --inet ' && WGET_OPTS="$WGET_OPTS --inet"
 	wget --help 2>&1 | grep -q -- ' --retry-connrefused ' && WGET_OPTS="$WGET_OPTS --retry-connrefused"
+	WGET_OPTS="$WGET_OPTS --user-agent=$USER_AGENT"
 
 	GETURI="wget --passive-ftp -c -nd -t$WGET_RETRIES $WGET_OPTS"
 	GETURI2="wget -c -nd -t$WGET_RETRIES $WGET_OPTS"
@@ -165,6 +192,13 @@ else
 	RPMBUILD="rpmbuild"
 fi
 
+#
+# are we using cvs-nserver ?
+#
+CVS_NSERVER=0
+cvs --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"
 
@@ -192,15 +226,15 @@ usage()
 {
 	if [ -n "$DEBUG" ]; then set -xv; fi
 	echo "\
-Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
+Usage: builder [-D|--debug] [-V|--version] [--short-version] [-a|--as_anon] [-b|-ba|--build]
 [-bb|--build-binary] [-bs|--build-source] [-bc] [-bi] [-bl] [-u|--try-upgrade]
 [{-cf|--cvs-force}] [{-B|--branch} <branch>] [{-d|--cvsroot} <cvsroot>]
 [-g|--get] [-h|--help] [--http] [{-l|--logtofile} <logfile>] [-m|--mr-proper]
 [-q|--quiet] [--date <yyyy-mm-dd> [-r <cvstag>] [{-T|--tag <cvstag>]
 [-Tvs|--tag-version-stable] [-Ts|--tag-stable] [-Tv|--tag-version]
-[{-Tp|--tag-prefix} <prefix>] [{-tt|--test-tag}]
+[{-Tp|--tag-prefix} <prefix>] [{-tt|--test-tag}] [--use-greed-sources]
 [-nu|--no-urls] [-v|--verbose] [--opts <rpm opts>] [--short-circuit]
-[--show-bconds] [--with/--without <feature>] [--define <macro> <value>] 
+[--show-bconds] [--with/--without <feature>] [--define <macro> <value>]
 <package>[.spec][:cvstag]
 
 -5, --update-md5    - update md5 comments in spec, implies -nd -ncs
@@ -208,7 +242,8 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
 -n5, --no-md5       - ignore md5 comments in spec
 -D, --debug         - enable builder script debugging mode,
 -debug              - produce rpm debug package (same as --opts -debug)
--V, --version       - output builder version
+-V, --version       - output builder version string
+--short-version     - output builder short version
 -a, --as_anon       - get files via pserver as cvs@$CVS_SERVER,
 -b, -ba, --build    - get all files from CVS repo or HTTP/FTP and build package
                       from <package>.spec,
@@ -223,12 +258,17 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
 --short-circuit     - short-circuit build
 -B, --branch        - add branch
 -c, --clean         - clean all temporarily created files (in BUILD, SOURCES,
-                      SPECS and \$RPM_BUILD_ROOT),
+                      SPECS and \$RPM_BUILD_ROOT and CVS/Entries) after rpmbuild commands.
+-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,
@@ -236,8 +276,6 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
 --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
@@ -247,6 +285,7 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
 -ns, --no-srcs      - don't download Sources
 -ns0, --no-source0  - don't download Source0
 -nn, --no-net       - don't download anything from the net
+-pm, --prefer-mirrors - prefer mirrors (if any) over distfiles for SOURCES
 --no-init           - don't initialize builder paths (SPECS and SOURCES)
 -ske,
 --skip-existing-files - skip existing files in get_files
@@ -267,6 +306,7 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
 -sd, --source-distfiles - list sources available from distfiles (intended for offline
                       operations; does not work when Icon field is present
                       but icon file is absent),
+-sc, --source-cvs - list sources available from CVS
 -sdp, --source-distfiles-paths - list sources available from distfiles -
                       paths relative to distfiles directory (intended for offline
                       operations; does not work when Icon field is present
@@ -297,6 +337,9 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
 -u, --try-upgrade   - check version, and try to upgrade package
 -un, --try-upgrade-with-float-version
                     - as above, but allow float version
+--use-greed-sources
+                    - try download source from tag head if don't find it in
+                      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.
@@ -318,6 +361,16 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
 "
 }
 
+# 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}')
+	echo "$package"
+}
+
 update_shell_title() {
 	[ -t 1 ] || return
 	local len=${COLUMNS:-80}
@@ -365,40 +418,28 @@ set_spec_target() {
 	fi
 }
 
-cache_rpm_dump () {
-	if [ -n "$DEBUG" ]; then
-		set -x
-		set -v
-	fi
-
-	update_shell_title "cache_rpm_dump"
-	local rpm_dump
-	rpm_dump=`
-
+# runs rpm with minimal macroset
+minirpm() {
 	# we reset macros not to contain macros.build as all the %() macros are
 	# executed here, while none of them are actually needed.
-	# what we need from dump is NAME, VERSION, RELEASE and PATCHES/SOURCES.
 	# at the time of this writing macros.build + macros contained 70 "%(...)" macros.
-	macrofiles="/usr/lib/rpm/macros:$SPECS_DIR/.builder-rpmmacros:~/etc/.rpmmacros:~/.rpmmacros"
-	dump='%{echo:dummy: PACKAGE_NAME %{name} }%dump'
-	if [ -f /usr/lib/rpm/rpmrc ]; then
-		# FIXME: better ideas than .rpmrc?
-		printf 'include:/usr/lib/rpm/rpmrc\nmacrofiles:%s\n' $macrofiles > .builder-rpmrc
-	else
-		printf 'macrofiles:%s\n' $macrofiles > .builder-rpmrc
-	fi
-# TODO: move these to /usr/lib/rpm/macros
-	cat > .builder-rpmmacros <<'EOF'
+	safe_macrofiles=$(rpm --showrc | awk -F: '/^macrofiles/ { gsub(/^macrofiles[ \t]+:/, "", $0); gsub(/:.*macros.build:/, ":", $0); print $0 } ')
+
+	# TODO: move these to /usr/lib/rpm/macros
+	cat > $BUILDER_MACROS <<'EOF'
+%x8664 x86_64 amd64 ia32e
 %alt_kernel %{nil}
 %_alt_kernel %{nil}
 %requires_releq_kernel_up %{nil}
 %requires_releq_kernel_smp %{nil}
+%requires_releq_kernel %{nil}
 %requires_releq() %{nil}
 %pyrequires_eq() %{nil}
 %requires_eq() %{nil}
 %requires_eq_to() %{nil}
 %releq_kernel_up ERROR
 %releq_kernel_smp ERROR
+%releq_kernel ERROR
 %kgcc_package ERROR
 %_fontsdir ERROR
 %ruby_version ERROR
@@ -407,6 +448,10 @@ cache_rpm_dump () {
 %__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
@@ -424,40 +469,58 @@ cache_rpm_dump () {
 ) \
 %{nil}
 EOF
-	case "$RPMBUILD" in
-	rpm)
-		ARGS='-bp'
-		;;
-	rpmbuild)
-		ARGS='--nodigest --nosignature --nobuild'
-		;;
-	esac
 	if [ "$NOINIT" = "yes" ] ; then
-		cat >> .builder-rpmmacros <<'EOF'
+		cat >> $BUILDER_MACROS <<'EOF'
 %_specdir ./
 %_sourcedir ./
 EOF
 	fi
-	$RPMBUILD --rcfile .builder-rpmrc $ARGS $ARGDIRS --nodeps --define "prep $dump" $BCOND $TARGET_SWITCH $SPECFILE 2>&1
-	`
-	if [ $? -gt 0 ]; then
-		error=$(echo "$rpm_dump" | sed -ne '/^error:/,$p')
-		echo "$error" >&2
-		Exit_error err_build_fail
+	eval $RPMBUILD --macros "$safe_macrofiles:$BUILDER_MACROS" $QUIET $RPMOPTS $RPMBUILDOPTS $BCOND $TARGET_SWITCH $* 2>&1
+}
+
+cache_rpm_dump() {
+	if [ -n "$DEBUG" ]; then
+		set -x
+		set -v
 	fi
 
-	# 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"
+	if [ -x /usr/bin/rpm-specdump ]; then
+		rpm_dump_cache=`rpm-specdump $BCOND $TARGET_SWITCH $SPECFILE`
+	else
+		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}
+		'`
+	fi
 
 	update_shell_title "cache_rpm_dump: OK!"
 }
 
-rpm_dump () {
+rpm_dump() {
 	if [ -z "$rpm_dump_cache" ] ; then
 		echo "internal error: cache_rpm_dump not called! (missing %prep?)" 1>&2
 	fi
@@ -486,7 +549,7 @@ parse_spec()
 	# icons are needed for successful spec parse
 	get_icons
 
-	cd $SPECS_DIR
+	cd $SPEC_DIR
 	cache_rpm_dump
 
 	if [ "$NOSRCS" != "yes" ]; then
@@ -499,9 +562,13 @@ parse_spec()
 
 	PATCHES="`rpm_dump | awk '/PATCHURL[0-9]+/ {print $3}'`"
 	ICONS="`awk '/^Icon:/ {print $2}' ${SPECFILE}`"
-	PACKAGE_NAME=$(rpm_dump | awk '$2 == "PACKAGE_NAME" { print $3}')
-	PACKAGE_VERSION=$(rpm_dump | awk '$2 == "PACKAGE_VERSION" { print $3}')
-	PACKAGE_RELEASE=$(rpm_dump | awk '$2 == "PACKAGE_RELEASE" { print $3}')
+	PACKAGE_NAME=$(rpm_dump | awk '$2 == "PACKAGE_NAME" { print $3; exit}')
+	PACKAGE_VERSION=$(rpm_dump | awk '$2 == "PACKAGE_VERSION" { print $3; exit}')
+	PACKAGE_RELEASE=$(rpm_dump | awk '$2 == "PACKAGE_RELEASE" { print $3; exit}')
+
+	if [ "$PACKAGE_NAME" != "$ASSUMED_NAME" ]; then
+		echo >&2 "WARNING! Spec name ($ASSUMED_NAME) does not agree with package name ($PACKAGE_NAME)"
+	fi
 
 	if [ -n "$BE_VERBOSE" ]; then
 		echo "- Sources :  `nourl $SOURCES`"
@@ -572,7 +639,6 @@ Exit_error()
 			remove_build_requires
 			echo "Error: conditions reject building this spec (${2})."
 			exit 12 ;;
-
 	esac
 	echo "Unknown error."
 	exit 100
@@ -586,11 +652,15 @@ init_builder()
 	fi
 
 	if [ "$NOINIT" != "yes" ] ; then
-		SOURCE_DIR="`eval $RPM $RPMOPTS --eval '%{_sourcedir}'`"
-		SPECS_DIR="`eval $RPM $RPMOPTS --eval '%{_specdir}'`"
+		local extra
+		if [ "$ASSUMED_NAME" ]; then
+			extra="--define 'name $ASSUMED_NAME'"
+		fi
+		SOURCE_DIR="`eval $RPM $RPMOPTS $extra --eval '%{_sourcedir}'`"
+		SPEC_DIR="`eval $RPM $RPMOPTS $extra --eval '%{_specdir}'`"
 	else
 		SOURCE_DIR="."
-		SPECS_DIR="."
+		SPEC_DIR="."
 	fi
 
 	__PWD="`pwd`"
@@ -606,7 +676,7 @@ get_spec()
 		set -v
 	fi
 
-	cd "$SPECS_DIR"
+	cd "$SPEC_DIR"
 	if [ ! -f "$SPECFILE" ]; then
 		SPECFILE="`basename $SPECFILE .spec`.spec"
 	fi
@@ -635,7 +705,7 @@ get_spec()
 
 find_mirror()
 {
-	cd "$SPECS_DIR"
+	cd "$SPEC_DIR"
 	local url="$1"
 	if [ ! -f "mirrors" -a "$NOCVSSPEC" != "yes" ] ; then
 		cvs update mirrors >&2
@@ -662,7 +732,7 @@ find_mirror()
 # Warning: unpredictable results if same URL used twice
 src_no ()
 {
-	cd $SPECS_DIR
+	cd $SPEC_DIR
 	rpm_dump | \
 	grep "SOURCEURL[0-9]*[ 	]*$1""[ 	]*$" | \
 	sed -e 's/.*SOURCEURL\([0-9][0-9]*\).*/\1/' | \
@@ -674,7 +744,7 @@ src_md5()
 	[ "$NO5" = "yes" ] && return
 	no=$(src_no "$1")
 	[ -z "$no" ] && return
-	cd $SPECS_DIR
+	cd $SPEC_DIR
 	local md5
 
 	if [ -f additional-md5sums ]; then
@@ -701,11 +771,16 @@ src_md5()
 	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
 }
@@ -826,9 +901,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[ 	]*:' $SPEC_DIR/$SPECFILE && continue
+			grep -qiE '^BuildRequires:[ 	]*digest[(]%SOURCE'$srcno'[)][ 	]*=' $SPEC_DIR/$SPECFILE && continue
 		else
-			grep -qiE '^#[ 	]*Source'$srcno'-md5[ 	]*:' $SPECS_DIR/$SPECFILE || continue
+			grep -qiE '^#[ 	]*Source'$srcno'-md5[ 	]*:' $SPEC_DIR/$SPECFILE || grep -qiE '^BuildRequires:[ 	]*digest[(]%SOURCE'$srcno'[)][ 	]*=' $SPEC_DIR/$SPECFILE || continue
 		fi
 		if [ ! -f "$fp" ] || [ $ALWAYS_CVSUP = "yes" ]; then
 			need_files="$need_files $i"
@@ -844,19 +920,24 @@ 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[ 	]*:' $SPEC_DIR/$SPECFILE )
+		if [ -z "$md5" ]; then
+			md5=$(grep -iE '^[ 	]*BuildRequires:[ 	]*digest[(]%SOURCE'$srcno'[)][ 	]*=' $SPEC_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
+			$SPEC_DIR/$SPECFILE
 		fi
 	done
 }
@@ -925,9 +1006,9 @@ get_files()
 					fi
 					target="$fp"
 
-					# prefer mirror over distfiles if there's mirror
+					# optionally prefer mirror over distfiles if there's mirror
 					# TODO: build url list and then try each url from the list
-					if [ -z "$NOMIRRORS" ] && im=$(find_mirror "$i") && [ "$im" != "$i" ]; then
+					if [ -n "$PREFMIRRORS" ] && [ -z "$NOMIRRORS" ] && im=$(find_mirror "$i") && [ "$im" != "$i" ]; then
 						url="$im"
 					else
 						url=$(distfiles_url "$i")
@@ -1016,7 +1097,11 @@ get_files()
 
 			# the md5 check must be moved elsewhere as if we've called from update_md5 the md5 is wrong.
 			if [ ! -f "$fp" -a "$FAIL_IF_NO_SOURCES" != "no" ]; then
-				Exit_error err_no_source_in_repo $i
+				if [ -n "GREEDSRC" ]; then
+					get_greed_sources $i
+				else
+					Exit_error err_no_source_in_repo $i
+				fi
 			fi
 
 			# we check md5 here just only to refetch immediately
@@ -1071,13 +1156,41 @@ make_tagver() {
 	if [ -z "${PACKAGE_NAME##[_0-9]*}" -a -z "$TAG_PREFIX" ]; then
 		TAG_PREFIX=tag_
 	fi
-	TAGVER=$TAG_PREFIX$PACKAGE_NAME-`echo $PACKAGE_VERSION | sed -e "s/\./\_/g" -e "s/@/#/g"`-`echo $PACKAGE_RELEASE | sed -e "s/\./\_/g" -e "s/@/#/g"`
+
+	# NOTE: CVS tags may must not contain the characters `$,.:;@'
+	TAGVER=$(echo $TAG_PREFIX$PACKAGE_NAME-$PACKAGE_VERSION-$PACKAGE_RELEASE | tr '[.@]' '[_#]')
+
 	# Remove #kernel.version_release from TAGVER because tagging sources
 	# could occur with different kernel-headers than kernel-headers used at build time.
-	TAGVER=$(echo "$TAGVER" | sed -e 's/#.*//g')
+	# besides, %{_kernel_ver_str} is not expanded.
+
+	# TAGVER=auto-ac-madwifi-ng-0-0_20070225_1#%{_kernel_ver_str}
+	# TAGVER=auto-ac-madwifi-ng-0-0_20070225_1
+
+	TAGVER=${TAGVER%#*}
 	echo -n "$TAGVER"
 }
 
+# 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 "$SPEC_DIR"
+	cvs status -v $SPECFILE | grep -Eiq "${TAG}.+(branch: [0-9.]+)"
+	return $?
+}
+
 tag_files()
 {
 	TAG_FILES="$@"
@@ -1090,9 +1203,9 @@ tag_files()
 	echo "Version: $PACKAGE_VERSION"
 	echo "Release: $PACKAGE_RELEASE"
 
-	TAGVER=`make_tagver`
-
+	local TAGVER
 	if [ "$TAG_VERSION" = "yes" ]; then
+		TAGVER=`make_tagver`
 		echo "CVS tag: $TAGVER"
 	fi
 	if [ -n "$TAG" ]; then
@@ -1104,6 +1217,18 @@ tag_files()
 		OPTIONS="-d $CVSROOT $OPTIONS"
 	fi
 
+	# 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 "$SOURCE_DIR"
 	local tag_files
 	for i in $TAG_FILES; do
@@ -1112,6 +1237,8 @@ tag_files()
 		local fp=`nourl "$i"`
 		if [ -f "$fp" ]; then
 			tag_files="$tag_files $fp"
+		elif [ -n "GREEDSRC" ]; then
+			get_greed_sources $i
 		else
 			Exit_error err_no_source_in_repo $i
 		fi
@@ -1120,22 +1247,29 @@ tag_files()
 	if [ "$tag_files" ]; then
 		if [ "$TAG_VERSION" = "yes" ]; then
 			update_shell_title "tag sources: $TAGVER"
-			cvs $OPTIONS $TAGVER $tag_files
+			printf "Tagging %d files\n" $(echo $tag_files | wc -w)
+			cvs $OPTIONS $TAGVER $tag_files || exit
 		fi
 		if [ -n "$TAG" ]; then
 			update_shell_title "tag sources: $TAG"
-			cvs $OPTIONS $TAG $tag_files
+
+			while [ "$tag_files" ]; do
+				local chunk=$(echo $tag_files | tr ' ' '\n' | head -n 100)
+				printf "Tagging %d files\n" $(echo $chunk | wc -w)
+				cvs $OPTIONS $TAG $chunk || exit
+				tag_files=$(echo $tag_files | tr ' ' '\n' | tail +101)
+			done
 		fi
 	fi
 
-	cd "$SPECS_DIR"
+	cd "$SPEC_DIR"
 	if [ "$TAG_VERSION" = "yes" ]; then
 		update_shell_title "tag spec: $TAGVER"
-		cvs $OPTIONS $TAGVER $SPECFILE
+		cvs $OPTIONS $TAGVER $SPECFILE || exit
 	fi
 	if [ -n "$TAG" ]; then
 		update_shell_title "tag spec: $TAG"
-		cvs $OPTIONS $TAG $SPECFILE
+		cvs $OPTIONS $TAG $SPECFILE || exit
 	fi
 }
 
@@ -1162,19 +1296,33 @@ branch_files()
 		local fp=`nourl "$i"`
 		if [ -f "$fp" ]; then
 			tag_files="$tag_files $fp"
+		elif [ -n "GREEDSRC" ]; then
+			get_greed_sources $i
 		else
 			Exit_error err_no_source_in_repo $i
 		fi
 	done
 	if [ "$tag_files" ]; then
-		cvs $OPTIONS $TAG $tag_files
+		cvs $OPTIONS $TAG $tag_files || exit
 	fi
 
-	cd "$SPECS_DIR"
-	cvs $OPTIONS $TAG $SPECFILE
+	cd "$SPEC_DIR"
+	cvs $OPTIONS $TAG $SPECFILE || exit
 }
 
 
+# this function should exit early if package can't be built for this arch
+# this avoids unneccessary BR filling.
+check_buildarch() {
+	local out ret
+	out=$(minirpm --short-circuit -bp --define "'prep exit 0'" --nodeps $SPECFILE 2>&1)
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		echo >&2 "$out"
+		exit $ret
+	fi
+}
+
 
 build_package()
 {
@@ -1184,7 +1332,7 @@ build_package()
 		set -v
 	fi
 
-	cd "$SPECS_DIR"
+	cd "$SPEC_DIR"
 
 	if [ -n "$TRY_UPGRADE" ]; then
 		update_shell_title "build_package: try_upgrade"
@@ -1212,7 +1360,7 @@ build_package()
 			unset TOLDVER TNEWVER TNOTIFY
 		fi
 	fi
-	cd "$SPECS_DIR"
+	cd "$SPEC_DIR"
 
 	case "$COMMAND" in
 		build )
@@ -1465,12 +1613,12 @@ run_sub_builder()
 	parent_spec_name=''
 
 	# Istnieje taki spec? ${package}.spec
-	if [ -f "${SPECS_DIR}/${package}.spec" ]; then
+	if [ -f "${SPEC_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
+	elif [ -f "${SPEC_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`
+		for provides_line in `grep ^Provides:.*$package  ${SPEC_DIR} -R`
 		do
 			echo $provides_line
 		done
@@ -1500,7 +1648,7 @@ spawn_sub_builder()
 		sub_builder_opts="${sub_builder_opts} -Upi"
 	fi
 
-	cd "${SPECS_DIR}"
+	cd "${SPEC_DIR}"
 	./builder ${sub_builder_opts} "$@"
 }
 
@@ -1517,7 +1665,7 @@ 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
@@ -1546,13 +1694,13 @@ display_branches()
 }
 
 # 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()
 {
 	local DEPS
 
-	if [ "$#" -gt 0 ]; then
+	if [ $# -gt 0 ]; then
 		DEPS="$@"
 	else
 		DEPS=$(cat)
@@ -1568,13 +1716,13 @@ _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
+# 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)
@@ -1587,38 +1735,45 @@ fetch_build_requires()
 {
 	if [ "${FETCH_BUILD_REQUIRES}" = "yes" ]; then
 		update_shell_title "fetch build requires"
-		if [ "$FETCH_BUILD_REQUIRES_RPMGETDEPS" = "yes" ]; then
-			local CONF=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^\-/ { print $3 } ' | _rpm_cnfl_check | xargs)
-			local DEPS=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^\+/ { print $3 } ' | _rpm_prov_check | xargs)
+		if [ "$FETCH_BUILD_REQUIRES_RPMGETDEPS" = "yes" ] || [ "$FETCH_BUILD_REQUIRES_RPMSPECSRPM" = "yes" ]; then
+			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
 
-			update_shell_title "poldek: update indexes"
-			if [ -n "$CONF" ] || [ -n "$DEPS" ]; then
+			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 "$CONF" ]; then
-				update_shell_title "uninstall conflicting packages: $CONF"
-				echo "Trying to uninstall conflicting packages ($CONF):"
-				$SU_SUDO /usr/bin/poldek --noask --nofollow -ev $CONF
+			if [ -n "$CNFL" ]; then
+				update_shell_title "uninstall conflicting packages: $CNFL"
+				echo "Trying to uninstall conflicting packages ($CNFL):"
+				$SU_SUDO /usr/bin/poldek --noask --nofollow -ev $CNFL
 			fi
 
-		while [ "$DEPS" ]; do
-				update_shell_title "install deps: $DEPS"
-				echo "Trying to install dependencies ($DEPS):"
-				local log=.${SPECFILE}_poldek.log
-				$SU_SUDO /usr/bin/poldek --caplookup -uGq $DEPS | tee $log
-				failed=$(awk -F: '/^error:/{print $2}' $log)
-				rm -f $log
-				local ok
-				if [ -n "$failed" ]; then
-					for package in $failed; do
-						# FIXME: sanitise, deps could be not .spec files
-						spawn_sub_builder -bb $package && ok="$ok $package"
-					done
-					DEPS="$ok"
-				else
-					DEPS=""
-				fi
-		done
+			while [ "$DEPS" ]; do
+					update_shell_title "install deps: $DEPS"
+					echo "Trying to install dependencies ($DEPS):"
+					local log=.${SPECFILE}_poldek.log
+					$SU_SUDO /usr/bin/poldek --caplookup -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
 			return
 		fi
 
@@ -1772,20 +1927,63 @@ init_rpm_dir() {
 
 	mkdir -p $TOP_DIR/{RPMS,BUILD,SRPMS}
 	cd $TOP_DIR
-	cvs -d $CVSROOT co SOURCES/.cvsignore SPECS/{mirrors,adapter{,.awk},fetchsrc_request,builder,{relup,repackage}.sh}
+	cvs -d $CVSROOT co SOURCES/{.cvsignore,dropin} SPECS/{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 "- remove $SPEC_DIR/CVS/Entries.Static"
+	echo "- run cvs up in $SPEC_DIR dir"
 
 	echo ""
 	echo "To commit with your developer account:"
-	echo "- edit $SPECS_DIR/CVS/Root"
+	echo "- edit $SPEC_DIR/CVS/Root"
 	echo "- edit $SOURCE_DIR/CVS/Root"
 }
 
+get_greed_sources() {
+	CVSROOT=":pserver:cvs@$CVS_SERVER:/cvsroot"
+	if [ -n "BE_VERBOSE" ]; then
+		echo "Try greed download: $1 from: $CVSROOT"
+	fi
+	cvs -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 $SPEC_DIR $SPECFILE
+	cvs_entry_remove $SOURCE_DIR $SOURCES $PATCHES
+
+	# remove spec and sources
+	$RPMBUILD --clean --rmsource --rmspec --nodeps $SPECFILE
+}
+
 #---------------------------------------------
 # main()
 
@@ -1815,6 +2013,8 @@ while [ $# -gt 0 ]; do
 			DEBUG="yes"; shift ;;
 		-V | --version )
 			COMMAND="version"; shift ;;
+		--short-version )
+			COMMAND="short-version"; shift ;;
 		-a | --as_anon )
 			CVSROOT=":pserver:cvs@$CVS_SERVER:/cvsroot"; shift ;;
 		-b | -ba | --build )
@@ -1876,6 +2076,9 @@ while [ $# -gt 0 ]; do
 			NOSRCS="yes"
 			ALWAYS_CVSUP="no"
 			shift;;
+		-pm | --prefer-mirrors )
+			PREFMIRRORS="yes"
+			shift;;
 		--no-init )
 			NOINIT="yes"
 			shift;;
@@ -1926,6 +2129,9 @@ while [ $# -gt 0 ]; do
 		-FRB | --force-remove-build-requires)
 			REMOVE_BUILD_REQUIRES="force"
 			shift ;;
+		-sc | --sources-cvs)
+			COMMAND="list-sources-cvs"
+			shift ;;
 		-sd | --sources-distfiles)
 			COMMAND="list-sources-distfiles"
 			shift ;;
@@ -1983,6 +2189,9 @@ while [ $# -gt 0 ]; do
 		--init-rpm-dir)
 			COMMAND="init_rpm_dir"
 			shift ;;
+		--use-greed-sources )
+			GREEDSRC="1"
+			shift;;
 		-u | --try-upgrade )
 			TRY_UPGRADE="1"; shift ;;
 		-un | --try-upgrade-with-float-version )
@@ -2001,6 +2210,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
@@ -2020,22 +2234,23 @@ while [ $# -gt 0 ]; do
 		-debug)
 			RPMBUILDOPTS="${RPMBUILDOPTS} -debug"; shift
 			;;
-		-* )
+		-*)
 			Exit_error err_invalid_cmdline "$1"
 			;;
-		* )
+		*)
 			SPECFILE="${1}"
 			# check if specname was passed as specname:cvstag
 			if [ "${SPECFILE##*:}" != "${SPECFILE}" ]; then
 				CVSTAG="${SPECFILE##*:}"
 				SPECFILE="${SPECFILE%%:*}"
 			fi
+			ASSUMED_NAME="$(basename ${SPECFILE%%.spec})"
 			shift
 	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)
+	CVSTAG=$(awk -vSPECFILE=$(basename ${SPECFILE%.spec}.spec) -F/ '$2 == SPECFILE && $6 ~ /^T/{print substr($6, 2)}' CVS/Entries)
 	if [ "$CVSTAG" ]; then
 		echo >&2 "builder: Stick tag $CVSTAG active. Use -r TAGNAME to override."
 	fi
@@ -2092,6 +2307,9 @@ case "$COMMAND" in
 			set_bconds_values
 			display_bconds
 			display_branches
+			if [ "$COMMAND" != "build-source" ]; then
+				check_buildarch
+			fi
 			fetch_build_requires
 			if [ "$INTEGER_RELEASE" = "yes" ]; then
 				echo "Checking release $PACKAGE_RELEASE..."
@@ -2102,16 +2320,7 @@ 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
-
-				TAGVER=`make_tagver`
+				local TAGVER=`make_tagver`
 				echo "Searching for tag $TAGVER..."
 				TAGREL=$(cvs status -v $SPECFILE | grep -E "^[[:space:]]*${TAGVER}[[[:space:]]" | sed -e 's#.*(revision: ##g' -e 's#).*##g')
 				if [ -n "$TAGREL" ]; then
@@ -2215,7 +2424,7 @@ case "$COMMAND" in
 		fi
 		;;
 	"mr-proper" )
-		$RPM --clean --rmsource --rmspec --force --nodeps $SPECFILE
+		mr_proper
 		;;
 	"list-sources-files" )
 		init_builder
@@ -2272,13 +2481,30 @@ case "$COMMAND" in
 			fi
 		done
 		;;
+	"list-sources-cvs" )
+		init_builder
+#		NOCVSSPEC="yes"
+		DONT_PRINT_REVISION="yes"
+		get_spec
+		parse_spec
+		for SAP in $SOURCES $PATCHES; do
+			if [ -z "$(src_md5 "$SAP")" ]; then
+				echo $SAP | awk '{gsub(/.*\//,"") ; print}'
+			fi
+		done
+		;;
 	"init_rpm_dir")
 		init_rpm_dir
 		;;
 	"usage" )
-		usage;;
+		usage
+		;;
+	"short-version" )
+		echo "$VERSION"
+		;;
 	"version" )
-		echo "$VERSION";;
+		echo "$VERSIONSTRING"
+		;;
 esac
 if [ -f "`pwd`/.${SPECFILE}_INSTALLED_PACKAGES" -a "$REMOVE_BUILD_REQUIRES" != "" ]; then
 	rm "`pwd`/.${SPECFILE}_INSTALLED_PACKAGES"