Browse Source

set STABLE_VERSION to 6.0

git-svn-id: http://trac.vinelinux.org/repos/projects/vbootstrap/trunk@4530 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 12 years ago
parent
commit
fb784fe7e7
3 changed files with 10 additions and 4 deletions
  1. 1 1
      Makefile
  2. 8 2
      vbootstrap-vl.spec
  3. 1 1
      vbuilder.sh.in

+ 1 - 1
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.2
+VBUILDER_STABLE_VERSION=6.0
 VBUILDER_DEFAULT_VERSION=VineSeed
 VBUILDER_CATEGORIES=main,plus,nonfree
 VBUILDER_VBOOTSTRAP_DIR=/var/local/vbootstrap

+ 8 - 2
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.44
+%define version 0.0.45
 
 Summary: bootstrap scripts to create a basic Vine Linux system
 Summary(ja): Vine Linux の基本システムを作成するためのスクリプト
@@ -53,9 +53,12 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 
 %build
 %__make \
-    %if %{?_dist_release} == "vl5"
+    %if %{?_dist_release} == "vl6"
       VBUILDER_DEFAULT_VERSION=\${VBUILDER_STABLE_VERSION}
     %endif
+    %if %{?_dist_release} == "vl5"
+      VBUILDER_DEFAULT_VERSION=5.2
+    %endif
 
 %install
 %__make DESTDIR=$RPM_BUILD_ROOT install
@@ -80,6 +83,9 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 
 
 %changelog
+* Tue Aug 09 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.45-1
+- set STABLE_VERSION to 6.0
+
 * Sat Jun 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.44-1
 - updated vbuilder
   - allowed some illegal patterns of %%{release}

+ 1 - 1
vbuilder.sh.in

@@ -562,7 +562,7 @@ Build(){
 	    # [ $with_category_security -eq 1 ] && \
 	    # 	echo 
 	    ;;
-	@@VBUILDER_STABLE_VERSION@@)
+	5.2|@@VBUILDER_STABLE_VERSION@@)
 	    [ $with_category_plus -eq 1 ] && \
 		$__chroot_sh 'apt-get -qq update && apt-get -qq -y install apt-sourceslist-plus'
 	    [ $with_category_nonfree -eq 1 ] && \