updated vbuilder.sh.in

git-svn-id: http://trac.vinelinux.org/repos/projects/vbootstrap/trunk@471 ec354946-7b23-47d6-9f5a-488ba84defc7

vbuilder.sh.in

@@ -260,6 +260,8 @@ setup-vbootstrap(){
 
     fi
 
+    MAJOR_VERSION=$(echo ${VERSION} | sed -e "s/_i[0-9]86//")
+
     BUILD_ROOT=${VBOOTSTRAP_DIR}/${VERSION}
     BUILD_USER=vbuilder
     BUILD_DIR=/home/${BUILD_USER}/rpm
@@ -459,7 +461,7 @@ Build(){
     $__chroot_sh 'apt-get -qq update && apt-get -qq -y dist-upgrade'
 
     ##!! 4.2 has no apt-sourceslist-{plus,nonfree} packages
-    if [ "$(echo ${VERSION} | sed s/_i386//)" != "4.2" ]; then
+    if [ "${MAJOR_VERSION}" != "4.2" ]; then
 	$__chroot_sh 'apt-get -qq update && apt-get -qq -y install apt-sourceslist-plus'
 	$__chroot_sh 'apt-get -qq update && apt-get -qq -y install apt-sourceslist-nonfree'
     fi
@@ -557,10 +559,10 @@ RPM_Build(){
     echo "Copying built rpms to ${HOME}/rpm/ for each archtectures ... "
     for i in $RPM_PKG_ARCH_LIST; do \
 	if [ -d $BUILD_ROOT${BUILD_DIR}/${i} ]; then
-	    [ -d ${BUILT_RPMS_DIR}/${i} ] || \
-		$__install -d ${BUILT_RPMS_DIR}/${i}/
+	    [ -d ${BUILT_RPMS_DIR}/${MAJOR_VERSION}/${i} ] || \
+		$__install -d ${BUILT_RPMS_DIR}/${MAJOR_VERSION}/${i}/
 	    find $BUILD_ROOT${BUILD_DIR}/${i} -type f -regex '.*\.rpm' \
-		-exec $__install -m0644 {} ${BUILT_RPMS_DIR}/${i}/ \;
+		-exec $__install -m0644 {} ${BUILT_RPMS_DIR}/${MAJOR_VERSION}/${i}/ \;
 	fi
     done