update to Vine6

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

a/apt-sourceslist-plus/apt-sourceslist-plus-vl.spec

@@ -1,13 +1,20 @@
-%define build_vineseed %(grep -c VineSeed /etc/vine-release)
-%define build_vine5 %( [ "%{?_dist_release}" == "vl5" ] && echo 1 || echo 0)
+%bcond_with vine6
+%if %with vine6
+%define build_vine6 1
+%define build_vineseed 0
+%else
+%define build_vine6 0
+%define build_vineseed 1
+%define _vineseed .vineseed
+%endif
 
 Summary:	Sources.list file for plus category
 Summary(ja):	plus カテゴリ用の sources.list ファイル
 Name:		apt-sourceslist-plus
-Version:	1.1
+Version:	1.3
 Release: 	1%{?_dist_release}
 Source0:	sources.list-vineseed-plus
-Source1:	sources.list-vine5-plus
+Source1:	sources.list-vine6-plus
 License:	GPL
 Group:		Applications/Administration
 #URL:		
@@ -38,7 +45,7 @@ Vine Plus の plus カテゴリのパッケージをインストールする場
 
 %if %{build_vineseed}
 %{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_sysconfdir}/apt/sources.list.d/plus.list
-%elseif %{build_vine5}
+%elseif %{build_vine6}
 %{__install} -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/apt/sources.list.d/plus.list
 %endif
 
@@ -52,6 +59,13 @@ Vine Plus の plus カテゴリのパッケージをインストールする場
 
 
 %changelog
+* Mon May 30 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.3-1
+- add  Vine Linux 6 list
+
+* Mon Oct 25 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.2-1
+- update to Vine Linux 5.2
+- change mirror list order
+
 * Sat Feb 13 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.1-1
 - update to Vine Linux 5.1
 

a/apt-sourceslist-plus/sources.list-vine5-plus

@@ -0,0 +1,21 @@
+# apt for RPM sources.list 
+
+##
+## Vine Linux 5.2 FTP
+##
+#
+# (jaist mirror)
+#rpm     [vine] http://ftp.jaist.ac.jp/pub/Linux/Vine/apt 5.2/$(ARCH) plus
+#rpm-src [vine] http://ftp.jaist.ac.jp/pub/Linux/Vine/apt 5.2/$(ARCH) plus
+#
+# (ring mirror)
+#rpm     [vine] http://www.t.ring.gr.jp/pub/linux/Vine/apt 5.2/$(ARCH) plus
+#rpm-src [vine] http://www.t.ring.gr.jp/pub/linux/Vine/apt 5.2/$(ARCH) plus
+#
+# (kddlabs mirror)
+#rpm     [vine] http://ftp.kddlabs.co.jp/pub/Linux/distributions/Vine/apt 5.2/$(ARCH) plus
+#rpm-src [vine] http://ftp.kddlabs.co.jp/pub/Linux/distributions/Vine/apt 5.2/$(ARCH) plus
+#
+# (master)
+rpm     [vine] http://updates.vinelinux.org/apt 5.2/$(ARCH) plus
+rpm-src [vine] http://updates.vinelinux.org/apt 5.2/$(ARCH) plus

a/apt-sourceslist-plus/sources.list-vine6-plus

@@ -0,0 +1,21 @@
+# apt for RPM sources.list 
+
+##
+## Vine Linux 6 FTP
+##
+#
+# (jaist mirror)
+#rpm     [vine] http://ftp.jaist.ac.jp/pub/Linux/Vine/apt 6/$(ARCH) plus
+#rpm-src [vine] http://ftp.jaist.ac.jp/pub/Linux/Vine/apt 6/$(ARCH) plus
+#
+# (ring mirror)
+#rpm     [vine] http://www.t.ring.gr.jp/pub/linux/Vine/apt 6/$(ARCH) plus
+#rpm-src [vine] http://www.t.ring.gr.jp/pub/linux/Vine/apt 6/$(ARCH) plus
+#
+# (kddlabs mirror)
+#rpm     [vine] http://ftp.kddlabs.co.jp/pub/Linux/distributions/Vine/apt 6/$(ARCH) plus
+#rpm-src [vine] http://ftp.kddlabs.co.jp/pub/Linux/distributions/Vine/apt 6/$(ARCH) plus
+#
+# (master)
+rpm     [vine] http://updates.vinelinux.org/apt 6/$(ARCH) plus
+rpm-src [vine] http://updates.vinelinux.org/apt 6/$(ARCH) plus

a/apt-sourceslist-plus/sources.list-vineseed-plus

@@ -0,0 +1,21 @@
+# apt for RPM sources.list 
+
+##
+## Vine Seed FTP
+##
+#
+# (jaist mirror)
+#rpm     [vine] http://ftp.jaist.ac.jp/pub/Linux/Vine/apt VineSeed/$(ARCH) plus
+#rpm-src [vine] http://ftp.jaist.ac.jp/pub/Linux/Vine/apt VineSeed/$(ARCH) plus
+#
+# (ring mirror)
+#rpm     [vine] http://www.t.ring.gr.jp/pub/linux/Vine/apt VineSeed/$(ARCH) plus
+#rpm-src [vine] http://www.t.ring.gr.jp/pub/linux/Vine/apt VineSeed/$(ARCH) plus
+#
+# (kddlabs mirror)
+#rpm     [vine] http://ftp.kddlabs.co.jp/pub/Linux/distributions/Vine/apt VineSeed/$(ARCH) plus
+#rpm-src [vine] http://ftp.kddlabs.co.jp/pub/Linux/distributions/Vine/apt VineSeed/$(ARCH) plus
+#
+# (master)
+rpm     [vine] http://updates.vinelinux.org/apt VineSeed/$(ARCH) plus
+rpm-src [vine] http://updates.vinelinux.org/apt VineSeed/$(ARCH) plus