move realized funcs to common place

share/eterbuild/functions/spec

@@ -26,10 +26,23 @@ get_release()
 	eval_spec $1 | get_var "Release"
 }
 
-# get current release number
+# get 11 from alt11, 12.1 from alt12.1t
+get_numrelease()
+{
+	get_release "$1" | sed -e "s|\([a-Z]*\)\([0-9.]\)[^0-9.]*|\2|"
+}
+
+# get alt from alt11
+get_txtrelease()
+{
+	get_release "$1" | sed -e "s|\([a-Z]*\)\([0-9.]\).*|\1|"
+}
+
+# Obsoleted: get current release number
 get_release_number()
 {
-	get_release $1 | sed -e "s/alt//" | sed -e "s/%{_vendor}//" | sed -e "s/eter//" | sed -e "s/%_vendor//"
+	echo "Obsoleted get_release_number, use get_numrelease instead" >/dev/stderr
+	get_numrelease "$1"
 }
 
 
@@ -47,6 +60,24 @@ set_release()
 	set_var $1 Release $RELEASE
 }
 
+# inc 2 release to 3
+inc_release()
+{
+	BASERELEASE=$(get_numrelease $1)
+	set_release "$i" $(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|.*\.||"`
+	[ "$MINOR" = "$BASERELEASE" ] && MINOR="0"
+	set_release "$1" "$(get_txtrelease $1)${MAJOR}.$(($MINOR + 1 ))"
+}
+
+
 # Set version for spec (args: spec version), f.i. test.spec 1.2.3)
 # Supports %major and %ver_major macros in spec
 #      2.6.1 (), 2.6 (major)  .1 (minor)

tests/set_release.sh → tests/get_release.sh

 #!/bin/sh
 
-#. /etc/rpm/etersoft-build-functions
-
-#. /usr/share/eterbuild/common
+. `dirname $0`/../share/eterbuild/functions/common
+load_mod spec
 
 check()
 {
@@ -20,34 +19,6 @@ set_release()
 	echo "$2"
 }
 
-# get 11 from alt11, 12.1 from alt12.1t
-get_numrelease()
-{
-	get_release "$1" | sed -e "s|\([a-Z]*\)\([0-9.]\)[^0-9.]*|\2|"
-}
-
-# get alt from alt11
-get_txtrelease()
-{
-	get_release "$1" | sed -e "s|\([a-Z]*\)\([0-9.]\).*|\1|"
-}
-
-# inc 2 release to 3
-inc_release()
-{
-	BASERELEASE=$(get_numrelease $1)
-	set_release "$i" $(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|.*\.||"`
-	[ "$MINOR" = "$BASERELEASE" ] && MINOR="0"
-	set_release "$1" "$(get_txtrelease $1)${MAJOR}.$(($MINOR + 1 ))"
-}
 
 TESTREL=alt2
 check get_release alt2 `get_release`