vim-rt obsoletes vim-syntax-upstart (file conflict, so apparently merged)

diff --git a/vim.spec b/vim.spec
index c5f8cc3b7655f80b6faa5c82cff808ce4e259baf..8efc5d6ca5103cd0629ea158517b9a9074c4cd35 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -28,7 +28,7 @@
 
 %define                ver             7.4
 %define                patchlevel      023
-%define                rel             2
+%define                rel             3
 Summary:       Vi IMproved - a Vi clone
 Summary(de.UTF-8):     VIsual editor iMproved
 Summary(es.UTF-8):     Editor visual incrementado
@@ -169,6 +169,7 @@ Provides:   vim-editor = %{epoch}:%{version}-%{release}
 Obsoletes:     vim-enhanced
 Obsoletes:     vim-ispell
 Obsoletes:     vim-plugin-multvals
+Obsoletes:     vim-syntax-upstart
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # configure redefines it to =1