use erc embedded in epm

bin/myhsh

@@ -92,7 +92,7 @@ if [ -n "$REMOVEPKG" ] ; then
 	echo "Removing package(s)..."
 	# use when eepm >= 1.3.0 will everywhere
 	#docmd $HSH-run --rooter $HASHERDIR -- epm remove $LISTNAMES
-	docmd $HSH-run --rooter $HASHERDIR -- rpm -e $(epm print pkgname from filename $LISTNAMES)
+	docmd $HSH-run --rooter $HASHERDIR -- rpm -e $($EPMCMD print pkgname from filename $LISTNAMES)
 
 	#echo "Cleanup hasher in $HASHERDIR ..."
 	#docmd $HSH --cleanup-only $HASHERDIR

bin/rpmbs

@@ -187,7 +187,7 @@ extract_tarball_to_dest()
 		local TARNAME=$(querypackage $1 "" "%{NAME}-%{VERSION}")
 		# FIXME: hack to replace alt release to eter
 		local TARGETTARNAME=$(querypackage $1 "" "%{NAME}-%{VERSION}-%{RELEASE}" | sed -e "s/-alt/-eter/g")
-		erc --force conv $TARNAME*.tar* $2/$TARGETTARNAME.tar.bz2
+		$ERCCMD --force conv $TARNAME*.tar* $2/$TARGETTARNAME.tar.bz2
 		make_md5sum $2 $TARGETTARNAME.tar.bz2
 		# copy other tarballs
 		for i in $(ls -1 *.tar* | grep -v "^$TARNAME.*\.tar.*") ; do

bin/rpmgs

@@ -65,7 +65,7 @@ repack_tarball()
 		mv -f "$1" "$2"
 		return
 	fi
-	docmd erc -f repack "$1" "$2" || return
+	docmd $ERCCMD -f repack "$1" "$2" || return
 	# remove original
 	rm -f "$1"
 }
@@ -73,7 +73,7 @@ repack_tarball()
 check_tarball()
 {
 	[ -s "$1" ] || return
-	erc -q check "$1"
+	$ERCCMD -q check "$1"
 }
 
 # Args: URL TARGET
@@ -108,7 +108,7 @@ git_to_tarball()
 
 	rm -rf "$d/.git/"
 	# note: TARGET can be various
-	docmd erc pack "$TARGET" "$d" || fatal
+	docmd $ERCCMD pack "$TARGET" "$d" || fatal
 	rm -rf "$d"
 }
 

etersoft-build-utils.spec

@@ -23,8 +23,9 @@ BuildArchitectures: noarch
 #BuildRequires: rpm-build-compat >= %altcompat_ver
 
 Requires: giter >= 1.20
-Requires: eepm >= 3.0
-Requires: erc >= 0.9.2
+Requires: eepm >= 3.62.1
+# use epm embedded
+#Requires: erc >= 0.9.2
 Requires: estrlist >= 0.2
 
 Requires: rpm-build

share/eterbuild/functions/common

@@ -182,7 +182,7 @@ DISTRVENDOR="$EPMCMD print info"
 
 # TODO: ERCCMD="$EPMCMD tool erc"
 ERCCMD=$(realpath $ETERBUILDBIN/../../erc/bin/erc 2>/dev/null)
-[ -x "$ERCCMD" ] || ERCCMD=erc
+[ -x "$ERCCMD" ] || ERCCMD="epm tool erc"
 
 print_list()
 {