[packages/vim] vim-rt obsoletes vim-syntax-upstart (file conflict, so apparently merged)

glen glen at pld-linux.org
Sun Sep 8 15:14:12 CEST 2013


commit 77fe7849ee8d8c0a099b5fe7a5d64e6fff9b45ee
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Sep 8 16:13:51 2013 +0300

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

 vim.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/vim.spec b/vim.spec
index c5f8cc3..8efc5d6 100644
--- 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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vim.git/commitdiff/77fe7849ee8d8c0a099b5fe7a5d64e6fff9b45ee



More information about the pld-cvs-commit mailing list