This commit was manufactured by cvs2git to create branch 'RA-branch'.

[packages/vim.git] / vim.spec

diff --git a/vim.spec b/vim.spec
index 72a93692ab76186987e25863faf6b121db6a14fd..f28b0bd4602553be92d7cd034aa84deaad63e586 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -11,7 +11,7 @@
 # _with_tcl            - with tcl interp
 
 %define                _ver            6.1
-%define                _patchlevel     212
+%define                _patchlevel     300
 
 Summary:       Vi IMproved - a Vi clone
 Summary(de):   VIsual editor iMproved
@@ -24,7 +24,7 @@ Summary(tr):  Geli
 Summary(uk):   Visual editor IMproved - ´ÄÉÎÏ ÷¦ÒÎÉÊ òÅÄÁËÔÏÒ :)
 Name:          vim
 Version:       %{_ver}.%{_patchlevel}
-Release:       4
+Release:       1
 Epoch:         4
 License:       Charityware
 Group:         Applications/Editors/Vim
@@ -223,6 +223,8 @@ Summary:    Vim with ispell support
 Summary(pl):   Vim z wsparciem dla ispella
 Group:         Applications/Editors/Vim
 Requires:      %{name}-rt = %{version}
+Conflicts:     ispell < 3.2.06
+Conflicts:     ispell-pl < 20021127-2
 
 %description ispell
 Text editor similar to Vi. This version is built with ispell support.