packages: builder - rpm macros version check

[glen]

Author: glen                         Date: Fri Feb 19 10:34:51 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rpm macros version check

---- Files affected:
packages:
   builder (1.606 -> 1.607) 

---- Diffs:

================================================================
Index: packages/builder
diff -u packages/builder:1.606 packages/builder:1.607
--- packages/builder:1.606	Mon Feb 15 09:42:39 2010
+++ packages/builder	Fri Feb 19 11:34:44 2010
@@ -36,6 +36,9 @@
 
 PATH="/bin:/usr/bin:/usr/sbin:/sbin:/usr/X11R6/bin"
 
+# required rpm-build-macros
+RPM_MACROS_VER=1.534
+
 COMMAND="build"
 TARGET=""
 
@@ -662,8 +665,19 @@
 
 	if [ "$NOINIT" != "yes" ] ; then
 		TOP_DIR=$(eval $RPM $RPMOPTS --eval '%{_topdir}')
-		REPO_DIR=$TOP_DIR
-		PACKAGE_DIR=$REPO_DIR/$ASSUMED_NAME
+
+		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
 	else
 		REPO_DIR="."
 		PACKAGE_DIR="."
@@ -1899,7 +1913,7 @@
 	TOP_DIR=$(eval $RPM $RPMOPTS --eval '%{_topdir}')
 	CVSROOT=":pserver:cvs@$CVS_SERVER:/cvsroot"
 
-	echo "Initialising rpm directories to $TOP_DIR from $CVSROOT"
+	echo "Initializing rpm directories to $TOP_DIR from $CVSROOT"
 	mkdir -p $TOP_DIR/{RPMS,BUILD,SRPMS}
 	cd $TOP_DIR
 	$CVS_COMMAND -d $CVSROOT co packages/{.cvsignore,rpm.groups,dropin,mirrors,md5,adapter{,.awk},fetchsrc_request,builder,{relup,compile,repackage}.sh}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/builder?r1=1.606&r2=1.607&f=u