SPECS: vim.spec - revert S: vi-editor due dep loop - update to 7.2.2 - do n...

[glen]

Author: glen                         Date: Mon Aug 18 10:39:11 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- revert S: vi-editor due dep loop
- update to 7.2.2
- do not enable mouse in default config (keep previous behaviour)

---- Files affected:
SPECS:
   vim.spec (1.444 -> 1.445) 

---- Diffs:

================================================================
Index: SPECS/vim.spec
diff -u SPECS/vim.spec:1.444 SPECS/vim.spec:1.445
--- SPECS/vim.spec:1.444	Sun Aug 17 22:51:42 2008
+++ SPECS/vim.spec	Mon Aug 18 12:39:05 2008
@@ -18,7 +18,7 @@
 %bcond_without	home_etc	# without home_etc support
 #
 %define		ver		7.2
-%define		patchlevel	0
+%define		patchlevel	2
 
 # cflags get changed while configuring
 %undefine	configure_cache
@@ -34,7 +34,7 @@
 Summary(uk.UTF-8):	Visual editor IMproved - Єдино Вірний Редактор :)
 Name:		vim
 Version:	%{ver}.%{patchlevel}
-Release:	2
+Release:	1
 Epoch:		4
 License:	Charityware
 Group:		Applications/Editors/Vim
@@ -93,12 +93,13 @@
 Patch20:	%{name}-nagios.patch
 Patch21:	%{name}-filetypes.patch
 Patch22:	%{name}-man_installation.patch
+Patch23:	%{name}-vimrc.patch
 Patch102:	%{name}-gtkfilechooser.patch
 Patch104:	%{name}-home_etc.patch
 Patch105:	%{name}-autopaste.patch
 Patch106:	%{name}-ft-cron.patch
 Patch107:	%{name}-relativenumber.patch
-%patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/7.1/7.1.%03g 1 %{patchlevel}
+%patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/7.2/7.2.%03g 1 %{patchlevel}
 URL:		http://www.vim.org/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf
@@ -355,13 +356,11 @@
 Group:		Applications/Editors/Vim
 # for hicolor icons
 Requires:	hicolor-icon-theme
-Requires:	rpm-whiteout
+Requires:	rpm-whiteout >= 1.3
 Requires:	vim-plugin-securemodelines
-Suggests:	vi-editor
 Suggests:	vim-syntax-spec
 Obsoletes:	gvim-bonobo
 Obsoletes:	vim-common
-Conflicts:	rpm-whiteout < 1.3
 
 %description rt
 This package contains macros, documentation, syntax configuration and
@@ -617,6 +616,7 @@
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 # home etc
 %{?with_home_etc:%patch104 -p1}
@@ -1236,6 +1236,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.445  2008/08/18 10:39:05  glen
+- revert S: vi-editor due dep loop
+- update to 7.2.2
+- do not enable mouse in default config (keep previous behaviour)
+
 Revision 1.444  2008/08/17 20:51:42  blues
 - vim-rt should suggest vi-editor for instalation (or maybe it should be
   required? What is purpose of vim-rt alone?)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/vim.spec?r1=1.444&r2=1.445&f=u