ソースを参照

upgrade to the brand-new VIM 7

Ralf S. Engelschall 19 年 前
コミット
eed45c8da9
2 ファイル変更15 行追加45 行削除
  1. 3 3
      vim/vim.patch
  2. 12 42
      vim/vim.spec

+ 3 - 3
vim/vim.patch

@@ -1,9 +1,9 @@
 The following patch adjust the RPM .spec syntax highlighting
 a little bit to better highlight OpenPKG RPM .spec files.
 
-Index: vim64/runtime/syntax/spec.vim
---- vim64/runtime/syntax/spec.vim.orig	2004-12-31 18:29:22 +0100
-+++ vim64/runtime/syntax/spec.vim	2005-10-15 20:21:09 +0200
+Index: vim70/runtime/syntax/spec.vim
+--- vim70/runtime/syntax/spec.vim.orig	2004-12-31 18:29:22 +0100
++++ vim70/runtime/syntax/spec.vim	2005-10-15 20:21:09 +0200
 @@ -83,7 +83,7 @@
  
  "One line macros - valid in all ScriptAreas

+ 12 - 42
vim/vim.spec

@@ -23,9 +23,10 @@
 ##
 
 #   package versions
-%define       V_vl  6.4
-%define       V_vs  64
-%define       V_pl  10
+%define       V_vl  7.0
+%define       V_vs  70
+%define       V_pl  0
+%define       V_spl 20060509
 
 #   package information
 Name:         vim
@@ -38,7 +39,7 @@ Class:        CORE
 Group:        Editor
 License:      Charityware
 Version:      %{V_vl}.%{V_pl}
-Release:      20060321
+Release:      20060509
 
 #   package options
 %option       with_x11        no
@@ -50,22 +51,9 @@ Release:      20060321
 %option       with_ruby       no
 
 #   list of sources
-Source0:      ftp://ftp.vim.org/pub/vim/unix/vim-%{V_vl}-src1.tar.gz
-Source1:      ftp://ftp.vim.org/pub/vim/unix/vim-%{V_vl}-src2.tar.gz
-Source2:      ftp://ftp.vim.org/pub/vim/unix/vim-%{V_vl}-rt1.tar.gz
-Source3:      ftp://ftp.vim.org/pub/vim/unix/vim-%{V_vl}-rt2.tar.gz
-Source4:      rc.vim
+Source0:      ftp://ftp.vim.org/pub/vim/unix/vim-%{V_vl}.tar.bz2
+Source2:      rc.vim
 Patch0:       vim.patch
-Patch1:       ftp://ftp.vim.org/pub/vim/patches/%{V_vl}/%{V_vl}.001
-Patch2:       ftp://ftp.vim.org/pub/vim/patches/%{V_vl}/%{V_vl}.002
-Patch3:       ftp://ftp.vim.org/pub/vim/patches/%{V_vl}/%{V_vl}.003
-Patch4:       ftp://ftp.vim.org/pub/vim/patches/%{V_vl}/%{V_vl}.004
-Patch5:       ftp://ftp.vim.org/pub/vim/patches/%{V_vl}/%{V_vl}.005
-Patch6:       ftp://ftp.vim.org/pub/vim/patches/%{V_vl}/%{V_vl}.006
-Patch7:       ftp://ftp.vim.org/pub/vim/patches/%{V_vl}/%{V_vl}.007
-Patch8:       ftp://ftp.vim.org/pub/vim/patches/%{V_vl}/%{V_vl}.008
-Patch9:       ftp://ftp.vim.org/pub/vim/patches/%{V_vl}/%{V_vl}.009
-Patch10:      ftp://ftp.vim.org/pub/vim/patches/%{V_vl}/%{V_vl}.010
 
 #   build information
 Prefix:       %{l_prefix}
@@ -105,38 +93,20 @@ AutoReqProv:  no
     help, and visual selection.
 
 %track
+    prog vim = {
+        version   = %{V_vl}
+        url       = ftp://ftp.vim.org/pub/vim/unix/
+        regex     = vim-(\d+.\d+)\.tar\.gz
+    }
     prog vim:patchlevel = {
         version   = %{V_vl}.0%{V_pl}
         url       = ftp://ftp.de.vim.org/patches/%{V_vl}/
         regex     = (\d+\.\d+\.\d+)
     }
-    prog vim:rt1 = {
-        version   = %{V_vl}
-        url       = ftp://ftp.vim.org/pub/vim/unix/
-        regex     = vim-(\d+.\d+)-rt1\.tar\.gz
-    }
-    prog vim:rt2 = {
-        version   = %{V_vl}
-        url       = ftp://ftp.vim.org/pub/vim/unix/
-        regex     = vim-(\d+.\d+)-rt2\.tar\.gz
-    }
-    prog vim:src1 = {
-        version   = %{V_vl}
-        url       = ftp://ftp.vim.org/pub/vim/unix/
-        regex     = vim-(\d+.\d+)-src1\.tar\.gz
-    }
-    prog vim:src2 = {
-        version   = %{V_vl}
-        url       = ftp://ftp.vim.org/pub/vim/unix/
-        regex     = vim-(\d+.\d+)-src2\.tar\.gz
-    }
 
 %prep
     #   unpack base distribution parts
     %setup -q -c
-    %setup -q -T -D -a 1
-    %setup -q -T -D -a 2
-    %setup -q -T -D -a 3
     %patch -p0
 
     #   apply remaining single patches