Merge branch 'master' of git.alt:packages/etersoft-build-utils

NEWS

+etersoft-build-utils-1.5.2: 11 Dec 2008
+- fix using from other projects
+- add get_version, fix inc_release, inc_subrelease
+- disable annoyed Target distro (use VERBOSE=1)
+- clean up code (thanks Slava Semushin for comments)
+- myhsh: disable -x (trace info)
+- fix rpmbb -r (buildreq) with git
+
 etersoft-build-utils-1.5.1: 06 Dec 2008
 - APTCONF sets used apt.conf if defined
 - add support for x86_64 build with generic i586 sources.list

bin/rpmbs

@@ -155,8 +155,9 @@ if [ -n "$SIGN" ]; then
 	release_check $LISTBUILT
 	# create tag according to package release
 	if is_git $SPECDIR ; then
+		local GEARCTAG=gear-create-tag
 		# needed corrent user.name/user.email for get GPG id
-		gear-create-tag --force
+		$GEARCTAG --force
 		# git push ?
 	fi
 	echog "Will try to sign follow packages with GPG: \$LISTBUILT"

etersoft-build-utils.spec

 Name: etersoft-build-utils
 Version: 1.5.1
-Release: alt1
+Release: alt2
 
 Summary: A set of build rpm utilities
 
@@ -60,6 +60,11 @@ RECOMMENDED packages: gcc-c++ perl-libwww ccache elinks mutt hasher curl
 %config(noreplace) %_sysconfdir/eterbuild/repos
 
 %changelog
+* Thu Dec 11 2008 Vitaly Lipatov <lav@altlinux.ru> 1.5.1-alt2
+- add get_version, fix inc_release, inc_subrelease
+- clean up code (thanks Slava Semushin for comments)
+- fix rpmbb -r (buildreq) with git
+
 * Sat Dec 06 2008 Vitaly Lipatov <lav@altlinux.ru> 1.5.1-alt1
 - APTCONF sets used apt.conf if defined
 - add support for x86_64 build with generic i586 sources.list

share/eterbuild/functions/rpm

@@ -16,6 +16,8 @@ uni_rpmbuild()
 	shift
 	local SPECNAME=$1
 	local SPECDIR=`dirname $SPECNAME`
+	local GEAR=gear
+	local GEARBUILDREQ=gear-buildreq
 	if [ -n "$USE_LEGACY_COMPRESSION" ] ; then
 		# FIXME: do not override -v
 		ONEPARAM="--define=_source_payload w9.gzdio"
@@ -23,7 +25,7 @@ uni_rpmbuild()
 	# TODO: add support for git
 	if [ "$COMMAND" = "buildreq" ] ; then
 		if is_git $SPECDIR ; then
-			$NICE gear-buildreq --commit -- $@
+			$NICE $GEARBUILDREQ --commit -- $@
 		else
 			$NICE $COMMAND $@
 		fi
@@ -34,11 +36,11 @@ uni_rpmbuild()
 		shift # skip spec name
 		[ -n "$SPECDIR" ] && [ "$SPECDIR" != "." ] && warning "Spec is not in git dir"
 		if [ "$MENV" = "SS" ] ; then
-			$NICE gear --commit --rpmbuild -- $COMMAND "$ONEPARAM" $@
+			$NICE $GEAR --commit --rpmbuild -- $COMMAND "$ONEPARAM" $@
 		else
 			# build src.rpm via hasher (on ALT)
 #			$NICE gear-hsh --build-args="-bs" --rpmbuild -- $COMMAND "$ONEPARAM" $@
-			$NICE gear --hasher -- myhsh --build-prog=$ETERBUILDDIR/functions/rebuild $@
+			$NICE $GEAR --hasher -- myhsh --build-prog=$ETERBUILDDIR/functions/rebuild $@
 		fi
 	else
 		$NICE $COMMAND "$ONEPARAM" $@

share/eterbuild/functions/spec

@@ -63,20 +63,25 @@ set_release()
 # inc 2 release to 3
 inc_release()
 {
-	BASERELEASE=$(get_numrelease $1)
-	set_release "$i" $(get_txtrelease $1)$(($BASERELEASE + 1 ))
+	local BASERELEASE=$(get_numrelease "$1")
+	set_release "$1" $(get_txtrelease "$1")$(($BASERELEASE + 1 ))
 }
 
 # inc 2.x to 2.(x+1) or 2 to 2.1
 inc_subrelease()
 {
-	BASERELEASE=$(get_numrelease $1)
-	MAJOR=`echo "$BASERELEASE" | sed -e "s|\..*||"`
-	MINOR=`echo "$BASERELEASE" | sed -e "s|.*\.||"`
+	local BASERELEASE=$(get_numrelease $1)
+	local MAJOR=`echo "$BASERELEASE" | sed -e "s|\..*||"`
+	local MINOR=`echo "$BASERELEASE" | sed -e "s|.*\.||"`
 	[ "$MINOR" = "$BASERELEASE" ] && MINOR="0"
 	set_release "$1" "$(get_txtrelease $1)${MAJOR}.$(($MINOR + 1 ))"
 }
 
+get_version()
+{
+	eval_spec $1 | get_var "Version"
+}
+
 
 # Set version for spec (args: spec version), f.i. test.spec 1.2.3)
 # Supports %major and %ver_major macros in spec