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

bin/rpmbph

@@ -243,7 +243,7 @@ test -z "$LISTNAMES" && fatal "Error: no such file"
 if [ "$VENDOR" = "alt" ] ; then
 	MDISTR=$MENV
 	test -z "$MDISTR" && fatal "missed backport version (f.i. run with -M24 param for Master 2.4)"
-	DISTRVERSION=`echo $MDISTR | sed -e "s|M\([0-9]\)\([0-9]\)|\1\.\2|g"  | sed -e "s|SS|Sisyphus|g"`
+	DISTRVERSION=$(get_altdistr_version $MDISTR)
 	# read man bash QUOTING and see /bin/shell-quote (libshell)
 	# due incompatible changes scince rpm-4.0.4-alt94 (15 Jun 2008)
 	#LISTRPMARGS="$LISTRPMARGS --define='_source_payload w9.gzdio'"

etersoft-build-utils.spec

 Name: etersoft-build-utils
 Version: 1.5.6
-Release: alt1
+Release: alt2
 
 Summary: A set of build rpm utilities
 
@@ -61,6 +61,10 @@ RECOMMENDED packages: gcc-c++ perl-libwww ccache elinks mutt hasher curl
 %config(noreplace) %_sysconfdir/eterbuild/repos
 
 %changelog
+* Wed Mar 04 2009 Vitaly Lipatov <lav@altlinux.ru> 1.5.6-alt2
+- small replacements fix for nx
+- fix build in empty RPM dir
+
 * Fri Feb 13 2009 Vitaly Lipatov <lav@altlinux.ru> 1.5.6-alt1
 - rpmbph: full rewrote repacking, add src.rpm and gear support
 - mkpatch: check Makefile before Makefile.in

share/eterbuild/functions/common

@@ -162,3 +162,14 @@ make_temp_file()
 	fi
 }
 
+# M50 -> 5.0
+get_altdistr_version()
+{
+	echo "$1" | sed -e "s|M\([0-9]\)\([0-9]\)|\1\.\2|g" | sed -e "s|SS|Sisyphus|g"
+}
+
+# 5.0 -> M50
+get_altdistr_mod()
+{
+	echo "$1" | sed -e "s|\([0-9]\)\.\([0-9]\)|M\1\2|g" | sed -e "s|Sisyphus|SS|g"
+}

share/eterbuild/functions/rpm

@@ -43,6 +43,7 @@ uni_rpmbuild()
 			$NICE $GEAR --hasher -- myhsh --build-prog=$ETERBUILDDIR/functions/rebuild $@ || RET=$?
 		fi
 	else
+		mkdir -p $RPMTOPDIR/BUILD $RPMTOPDIR/SRPMS
 		$NICE $RPMBUILD "$ONEPARAM" "$TWOPARAM" $@ || RET=$?
 	fi
 	[ -n "$VERBOSE" ] && echo "Run $RPMBUILD $ONEPARAM $TWOPARAM $@" || :
@@ -78,6 +79,7 @@ uni_rpminstall()
 	#	$NICE $GEARBUILDREQ --commit -- $@ || RET=$?
 	#else
 		echo -n "Install package "
+		mkdir -p $RPMTOPDIR/SOURCES $RPMTOPDIR/SRPMS $RPMTOPDIR/RPMS
 		rpm -iv "$TWOPARAM" $@ || RET=$?
 	#fi
 	return $RET

share/eterbuild/pkgrepl/pkgrepl.rpm

@@ -89,3 +89,7 @@ libhal-devel|hal-devel
 liblua5-devel|lua-devel
 libctemplate-devel|ctemplate-devel
 libuuid-devel|uuid-devel
+libesd-devel|esound-devel
+xorg-inputproto-devel|xorg-x11-proto-devel
+xorg-xextproto-devel|xorg-x11-proto-devel
+xorg-sdk|xorg-x11-server-devel

share/eterbuild/pkgrepl/pkgrepl.suse

@@ -70,8 +70,6 @@ libGLU-devel|xorg-x11-Mesa-devel
 
 gccmakedep|xorg-x11-util-devel
 
-libesd-devel|esound-devel
 sysvinit-utils|sysvinit
-xorg-inputproto-devel|xorg-x11-proto-devel
-xorg-xextproto-devel|xorg-x11-proto-devel
-xorg-sdk|xorg-x11-server
+
+netcat|netcat
\ No newline at end of file

tests/transf_altdistrversion.sh

+#!/bin/sh
+
+. `dirname $0`/../share/eterbuild/functions/common
+load_mod spec
+
+check()
+{
+	[ "$2" != "$3" ] && echo "FATAL with '$1': result '$2' do not match with '$3'" || echo "OK for '$1' with '$2'"
+}
+
+check_AD()
+{
+	check $1 $2 `get_altdistr_version $1`
+}
+
+check_MOD()
+{
+	check $1 $2 `get_altdistr_mod $1`
+}
+
+
+echo "Check get_altdistr_version"
+check_AD M40 4.0
+check_AD M30 3.0
+check_AD M41 4.1
+check_AD M50 5.0
+check_AD  SS Sisyphus
+
+echo "Check get_altdist_mod"
+check_MOD 2.4 M24
+check_MOD 3.0 M30
+check_MOD 4.0 M40
+check_MOD 4.1 M41
+check_MOD 5.0 M50
+check_MOD Sisyphus SS