fix libtoolize, fix vendor setting

bin/rpmbph

@@ -35,6 +35,8 @@ if [ "$VENDOR" = "alt" ] ; then
 	set_release $SPECNAME alt$(decrement_release $BASERELEASE).$MDISTR.$BASERELEASE
 	ADDDEF=""
 	CLEANTEXT=""
+	# due new libtool, affected on ALT Linux
+	RECONFT="%undefine __libtoolize"
 else
 	# Need our compat package and disable strong patch checking
 	BUILDREQ="BuildRequires: rpm-build-altlinux-compat >= 0.95\n$FIXPATCHFUZZ"
@@ -44,13 +46,15 @@ else
 	CLEANTEXT=""
 fi
 
-# due new libtool, affected on ALT Linux and Mandriva 2009.0
-RECONFT="%undefine __libtoolize"
+if [ "$VENDOR" = "mdv" ] || [ "$VENDOR" = "pclinux" ] ; then
+	# due new libtool, affected on Mandriva 2009.0
+	RECONFT="%define _disable_libtoolize 1"
+fi
 
 # Do not add BuildReq if already exist
 cat $SPECNAME | grep rpm-build-compat &>/dev/null && BUILDREQ="$FIXPATCHFUZZ"
 
-# TODO: fix readlink -m, introduced by new libtool and missed in RHEL4
+# TODO: fix readlink -m, introduced by new libtool and missed in RHEL4 (replace with readlink -e)
 # fix mktemp using for MCBC
 if [ "$VENDOR" = "mcbc" ] ; then
 	FIXMKTEMP="%__subst "s|mktemp -dt|mktemp -d|g" configure"

share/eterbuild/functions/rpm

@@ -15,6 +15,7 @@ uni_rpmbuild()
 	# just for fill by something
 	local ONEPARAM="-v"
 	local TWOPARAM="-v"
+	local THRPARAM="-v"
 
 	local SPECNAME=$1
 	local SPECDIR=`dirname $SPECNAME`
@@ -26,7 +27,7 @@ uni_rpmbuild()
 	fi
 
 	if [ -n "$USE_VENDOR" ] ; then
-		ONEPARAM="--define=_vendor $USE_VENDOR"
+		THRPARAM="--define=_vendor $USE_VENDOR"
 	fi
 	
 	if [ -n "$RPMTOPDIR" ] ; then
@@ -39,7 +40,7 @@ uni_rpmbuild()
 		#[ -n "$SPECDIR" ] && [ "$SPECDIR" != "." ] && warning "Spec is not in git dir (SPECDIR='$SPECDIR')"
 		# build package without MENV checking
 		if true || [ "$MENV" = "SS" ] ; then
-			$NICE $GEAR --commit --rpmbuild -- $RPMBUILD "$ONEPARAM" "$TWOPARAM" $@ || RET=$?
+			$NICE $GEAR --commit --rpmbuild -- $RPMBUILD "$ONEPARAM" "$TWOPARAM" "$THRPARAM" $@ || RET=$?
 		else
 			fatal "Build backported src.rpm from git is unsupported now"
 			# build src.rpm via hasher (on ALT)
@@ -48,9 +49,9 @@ uni_rpmbuild()
 		fi
 	else
 		mkdir -p $RPMTOPDIR/BUILD $RPMTOPDIR/SRPMS
-		$NICE $RPMBUILD "$ONEPARAM" "$TWOPARAM" $@ || RET=$?
+		$NICE $RPMBUILD "$ONEPARAM" "$TWOPARAM" "$THRPARAM" $@ || RET=$?
 	fi
-	[ -n "$VERBOSE" ] && echo "Run $RPMBUILD $ONEPARAM $TWOPARAM $@" || :
+	[ -n "$VERBOSE" ] && echo "Run $RPMBUILD $ONEPARAM $TWOPARAM $THRPARAM $@" || :
 	return $RET
 }