apt:

- 8.git416
  - drop vine4 support
  - add vine5/vineseed switch
  - update rpmpriorities for VineSeed (s/util-linux-ng/utillinux)
- 7.git416
  - update Summary and Description
  - update remove-old-kernels.lua
    - check /boot/vmlinuz and latest kernel package.



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

a/apt/apt-vl.spec

@@ -1,9 +1,9 @@
 %define with_python 1
 
-%define build_vine4 0
+%define build_vine5 0
 
-%if "%{?_dist_release}" == "vl4"
+%if "%{?_dist_release}" == "vl5"
-%define build_vine4 1
+%define build_vine5 1
 %endif
 
 %define snapver git416
@@ -11,7 +11,7 @@
 
 Name: apt
 Version: 0.5.15lorg3.95
-Release: 6.%{snapver}%{?_dist_release}
+Release: 8.%{snapver}%{?_dist_release}
 Summary: Advanced front-end for rpm (APT - Advanced Package Tool)
 Summary(ja): RPM の高機能なフロントエンド (APT - アドバンスドパッケージツール)
 Group: Applications/Administration
@@ -30,12 +30,10 @@ Source5: gpg-keyring.conf
 Source7: system-duplicate-package.conf
 Source8: allow-duplicated-upgrade.conf
 
-Source10: sources.list-0.5.15-vineseed
+Source10: sources.list-vine
-Source11: sources.list-0.5.15-vine4
+Source20: preferences.vine
-Source20: preferences.vineseed
-Source21: preferences.vine4
 Source30: rpmpriorities.vineseed
-Source31: rpmpriorities.vine4
+Source31: rpmpriorities.vine5
 
 Source50: remove-old-kernels.lua
 Source51: remove-old-kernels.conf
@@ -46,7 +44,7 @@ Source110: apt-japanese-man-pages.tar.bz2
 
 # patches from MDK/ALT/upstream
 
-# patches from fedora
+# patches from fedora/upstream
 # Fix ppc mapping
 Patch0: apt-0.5.15lorg3.2-ppc.patch
 # band aid for mmap issues (#211254)
@@ -106,7 +104,7 @@ BuildRequires: glibc-devel, popt
 BuildRequires: gettext
 BuildRequires: readline-devel >= 4.3
 BuildRequires: autoconf
-BuildRequires: docbook-utils
+BuildRequires: docbook-utils >= 0.6.14-4
 BuildRequires: cvs
 BuildRequires: libxml2-devel >= 2.6
 BuildRequires: lua-devel
@@ -192,7 +190,7 @@ This package contains the python binding for apt libraries.
 %patch180 -p1
 
 cp %{SOURCE100} po/ja.po
-%if %{build_vine4}
+%if %{build_vine5}
 cp %{SOURCE31} rpmpriorities
 %else
 cp %{SOURCE30} rpmpriorities
@@ -237,15 +235,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/apt/apt.conf.d
 mkdir -p %{buildroot}%{_sysconfdir}/apt/translate.list.d
 mkdir -p %{buildroot}%{_sysconfdir}/apt/sources.list.d
 install %{SOURCE1} %{buildroot}%{_sysconfdir}/apt/apt.conf
-%if %{build_vine4}
-install %{SOURCE11} %{buildroot}%{_sysconfdir}/apt/sources.list
-install %{SOURCE11} %{buildroot}%{_sysconfdir}/apt/sources.list.dist
-install %{SOURCE21} %{buildroot}%{_sysconfdir}/apt/preferences
-%else
 install %{SOURCE10} %{buildroot}%{_sysconfdir}/apt/sources.list
 install %{SOURCE10} %{buildroot}%{_sysconfdir}/apt/sources.list.dist
 install %{SOURCE20} %{buildroot}%{_sysconfdir}/apt/preferences
-%endif
 install %{SOURCE3} %{buildroot}%{_sysconfdir}/apt/vendors.list
 install rpmpriorities %{buildroot}%{_sysconfdir}/apt
 install %{SOURCE5} %{buildroot}%{_sysconfdir}/apt/apt.conf.d/gpg-keyring.conf
@@ -389,8 +381,15 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
-* Mon Aug 30 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 0.5.15lorg3.95-XXX.git416
+* Sat Mar 19 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 0.5.15lorg3.95-8.git416
+- drop vine4 support
+- add vine5 support
+- update rpmpriorities for VineSeed (s/util-linux-ng/utillinux)
+
+* Mon Aug 30 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 0.5.15lorg3.95-7.git416
 - update Summary and Description
+- update remove-old-kernels.lua
+  - check /boot/vmlinuz and latest kernel package.
 
 * Fri Mar  5 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 0.5.15lorg3.95-6.git416
 - add BR: lua-devel

a/apt/rpmpriorities.vine5

@@ -0,0 +1,17 @@
+Essential:
+  apt
+  basesystem
+  bash
+  vine-release
+  udev
+  e2fsprogs
+  filesystem
+  coreutils
+  glibc
+  initscripts
+  module-init-tools
+  util-linux-ng
+  pam
+  passwd
+  rpm
+  setup

a/apt/rpmpriorities.vineseed

@@ -0,0 +1,17 @@
+Essential:
+  apt
+  basesystem
+  bash
+  vine-release
+  udev
+  e2fsprogs
+  filesystem
+  coreutils
+  glibc
+  initscripts
+  module-init-tools
+  util-linux
+  pam
+  passwd
+  rpm
+  setup

a/apt/sources.list-vine

@@ -0,0 +1,7 @@
+# All the sources.list files are stored in /etc/apt/sources.list.d directory.
+# 
+# If you want to add or remove repositories such as plus, extras and nonfree,
+# You should execute apt-get install (or remove) command like this:
+# # apt-get install apt-sourceslist-extras
+# (*This will add extras repository)
+#