updated vbootstrap: supported Vine Linux 5.2

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

Makefile

@@ -2,7 +2,7 @@ NAME=vbootstrap
 VERSION=$(shell awk '/%define version/ { print $$3 }' ${NAME}-vl.spec)
 REVISION=$(shell LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2)
 
-VBUILDER_STABLE_VERSION=5.1
+VBUILDER_STABLE_VERSION=5.2
 VBUILDER_DEFAULT_VERSION=VineSeed
 VBUILDER_CATEGORIES=main,plus,nonfree
 VBUILDER_VBOOTSTRAP_DIR=/var/local/vbootstrap
@@ -56,3 +56,4 @@ rpm: tarbz2
 
 clean:
 	rm -fr *~ .*???~ vbootstrap.sh vbuilder.sh vbuilder.conf
+	find . -name *~ -exec rm -f {} \;

vbootstrap-vl.spec

@@ -1,7 +1,7 @@
 # This package is maintained on trac svn repository. Please do not change on local.
 # If you find a BUG, please report to Vine@vinelinux.org or mailing list or BTS.
 
-%define version 0.0.29
+%define version 0.0.31
 
 Summary: bootstrap scripts to create a basic Vine Linux system
 Summary(ja): Vine Linux の基本システムを作成するためのスクリプト
@@ -75,6 +75,13 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 
 
 %changelog
+* Fri Dec 03 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.31-1
+- supported Vine Linux 5.2
+
+* Sun Aug 08 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.30-1
+- updated vbuilder.sh.in
+  - added --rpmbuild-with option
+
 * Sat Jul 17 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.29-1
 - updated vbuilder.sh.in
   - added --sign option

vbootstrap/scripts/5.1 → vbootstrap/scripts/5.2

@@ -1,6 +1,6 @@
-# 5.1
+# 5.2
 
-INSTVER="5.1"
+INSTVER="5.2"
 BASE_PKGS="setup glibc coreutils bash apt rootfiles vine-release libstdc++34"
 APT_LINE="-o Dir::Etc::sourcelist=$VBOOTSTRAPDIR/sources.list.d/$INSTVER"
 

vbootstrap/scripts/5.1_i386 → vbootstrap/scripts/5.2_i386

@@ -1,6 +1,6 @@
-# 5.1_i386
+# 5.2_i386
 
-INSTVER="5.1_i386"
+INSTVER="5.2_i386"
 BASE_PKGS="setup glibc coreutils bash apt rootfiles vine-release libstdc++34"
 APT_LINE="-o Dir::Etc::sourcelist=$VBOOTSTRAPDIR/sources.list.d/$INSTVER"
 

vbootstrap/sources.list.d/5.1

@@ -1 +0,0 @@
-rpm http://updates.vinelinux.org/apt 5.1/$(ARCH) main plus nonfree

vbootstrap/sources.list.d/5.1_i386

@@ -1 +0,0 @@
-rpm http://updates.vinelinux.org/apt 5.1/i386 main plus nonfree

vbootstrap/sources.list.d/5.2

@@ -0,0 +1 @@
+rpm http://updates.vinelinux.org/apt 5.2/$(ARCH) main plus nonfree

vbootstrap/sources.list.d/5.2_i386

@@ -0,0 +1 @@
+rpm http://updates.vinelinux.org/apt 5.2/i386 main plus nonfree

vbuilder-bash-completion.sh

@@ -22,7 +22,7 @@ _vbuilder()
     first="${COMP_WORDS[1]}"
 
     ## The basic options we'll complete.
-    options="--version --arch --category --dist-upgrade --unionfs --target --with-compat32 --sign --no-install"
+    options="--version --arch --category --dist-upgrade --unionfs --target --with-compat32 --rpmbuild-with --sign --no-install --bootstrap-dir --cache-dir --built-rpms-dir"
     actions="clean build build-rpm install-rpm remove-rpm show-info"
     opts="$options $actions"
 
@@ -34,9 +34,9 @@ _vbuilder()
     case "${prev}" in
 	--version)
 	    if [ "$_arch" = "x86_64" ]; then
-		local running="VineSeed VineSeed_i386 5.1 5.1_i386 4.2_i386"
+		local running="VineSeed VineSeed_i386 5.2 5.2_i386 4.2_i386"
 	    else
-		local running="VineSeed 5.1 4.2"
+		local running="VineSeed 5.2 4.2"
 	    fi
 	    COMPREPLY=( $(compgen -W "${running}" -- "${cur}") )
 	    ;;