small fixes

bin/loginhsh

@@ -152,7 +152,7 @@ docmd $HSH-shell $HASHERDIR $SHELLHASHERARG $ROOTER -Y --shell
 
 if [ -n "$AUTOMODE" ] ; then
 	# FIXME: do not remove on x86_64
-	echo "Remove package for test preun scripts"
+	echo "Removing package for test preun scripts..."
 	# use when eepm >= 1.3.0 will everywhere
 	#docmd $HSH-run --rooter $HASHERDIR -- epm remove $LISTNAMES
 	docmd $HSH-run --rooter $HASHERDIR -- rpm -e $(drop_pkg_extensions $LISTNAMES)

bin/rpmcs

@@ -389,6 +389,7 @@ do
 
 	subst "s|^%__python setup.py build|%python_build|g" $i
 	subst 's|^CFLAGS="$RPM_OPT_FLAGS" python setup.py build|%python_build|g' $i
+	subst 's|^CFLAGS="%optflags" python setup.py build|%python_build|g' $i
 	subst "s|^%__python setup.py install --root.%buildroot|%python_install|g" $i
 	subst "s|^%__python setup.py install --skip-build --root %buildroot|%python_install|g" $i
 	subst "s|^%__python setup.py install -O1 --skip-build --root %buildroot|%python_install|g" $i
@@ -464,7 +465,8 @@ do
 
 	# Add packager
 	if ! grep "^Packager" $i ; then
-		PACKAGT="Packager: $($RPMBUILD --eval %packager $i)"
+		PACKAGT="Packager: $OWNERMAIL"
+		rhas "$OWNERMAIL" "packager" && fatal "Packager $OWNERMAIL is not defined correctly in ~/.rpmmacros"
 		cat $i | awk 'BEGIN{desk=0}{if(/^Source/&&desk==0){printf("%s\n\n", text);desk++};print}' text="$PACKAGT" >$i.tmp && mv -f $i.tmp $i
 	fi
 

etersoft-build-utils.spec

@@ -22,7 +22,7 @@ BuildArchitectures: noarch
 # Buildreqs note: C compiler is required by rpm-build; we do not require C++ here
 BuildRequires: rpm-build-compat >= %altcompat_ver
 
-Requires: giter >= 0.8
+Requires: giter >= 1.2
 Requires: eepm >= 1.5.0
 Requires: erc >= 0.8
 

share/eterbuild/functions/config

@@ -28,8 +28,8 @@ NICE="nice"
 RPMBUILD=rpmbuild
 
 # CHECKME: works only on ALT?
-RPMDIR=`rpm --eval %_topdir`
-RPMTMPDIR=`rpm --eval %_tmppath`
+RPMDIR=$(rpm --eval %_topdir) || fatal
+RPMTMPDIR=$(rpm --eval %_tmppath) || fatal
 
 # Can be overrided in the scripts
 [ -n "$RPMTOPDIR" ] || RPMTOPDIR="$RPMDIR"
@@ -38,7 +38,9 @@ RPMTMPDIR=`rpm --eval %_tmppath`
 
 #OWNERMAIL=`grep "^%packager" ~/.rpmmacros | head -n 1 | sed -e "s/%packager[ \t]*//g"`
 # works only on ALT?
-OWNERMAIL=`rpm --eval %packager`
+# TODO: get from git also?
+OWNERMAIL=$(rpm --eval %packager) || fatal
+
 
 COMPANYFTP=etersoft.ru
 TARGETFTPBASE="/var/ftp"
@@ -49,8 +51,9 @@ HASHERARG=""
 
 # TODO: do not use this notation at all
 # for use in help as example branch/distro name
-EXAMPLEALTDISTRVERSION="p6"
-CURRENTBRANCHNAME="M60"
+EXAMPLEALTDISTRVERSION="p7"
+# FIXME: obsoleted
+CURRENTBRANCHNAME="M70"
 
 # Build for Sisyphus by default
 MENV=SS