OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-May-2006 09:33:11
Branch: HEAD Handle: 2006050908331000
Modified files:
openpkg-src/vim vim.patch vim.spec
Log:
upgrade to the brand-new VIM 7
Summary:
Revision Changes Path
1.7 +3 -3 openpkg-src/vim/vim.patch
1.406 +12 -42 openpkg-src/vim/vim.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/vim/vim.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 vim.patch
--- openpkg-src/vim/vim.patch 15 Oct 2005 18:29:42 -0000 1.6
+++ openpkg-src/vim/vim.patch 9 May 2006 07:33:10 -0000 1.7
@@ -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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/vim/vim.spec
============================================================================
$ cvs diff -u -r1.405 -r1.406 vim.spec
--- openpkg-src/vim/vim.spec 21 Mar 2006 18:19:55 -0000 1.405
+++ openpkg-src/vim/vim.spec 9 May 2006 07:33:10 -0000 1.406
@@ -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 @@
Group: Editor
License: Charityware
Version: %{V_vl}.%{V_pl}
-Release: 20060321
+Release: 20060509
# package options
%option with_x11 no
@@ -50,22 +51,9 @@
%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 @@
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
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
