updated to 7.4.205

[packages/vim.git] / vim.spec

diff --git a/vim.spec b/vim.spec
index 06e56956a942e26b6b1bdf34050a33b0c847964d..e7b317d3669dacc3e9bce272fa00575b518c5c6a 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -27,7 +27,7 @@
 # VCS Commits: https://code.google.com/p/vim/source/browse/
 
 %define                ver             7.4
-%define                patchlevel      126
+%define                patchlevel      205
 %define                rel             1
 Summary:       Vi IMproved - a Vi clone
 Summary(de.UTF-8):     VIsual editor iMproved
@@ -98,8 +98,6 @@ Patch22:      %{name}-man_installation.patch
 Patch23:       %{name}-vimrc.patch
 Patch24:       %{name}-syntax-exports.patch
 Patch25:       sudoers-include.patch
-# FIXME: unused?
-Patch102:      %{name}-gtkfilechooser.patch
 Patch26:       %{name}-home_etc.patch
 Patch27:       %{name}-autopaste.patch
 Patch28:       %{name}-ft-cron.patch
@@ -113,6 +111,7 @@ Patch35:    %{name}-ft-mib.patch
 Patch36:       %{name}-ft-lib-udevrules.patch
 Patch37:       %{name}-ft-mysql.patch
 Patch38:       %{name}-ft-gyp.patch
+Patch39:       %{name}-revert-7.4.165-noundo.patch
 URL:           http://www.vim.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -237,8 +236,8 @@ fleira.
 VIM (Vi IMproved) è una versione aggiornata e perfezionata dell'editor
 vi. Vi è stato il primo editor per UNIX realmente basato su video ed è
 ancora molto diffuso. VIM perfeziona vi aggiungendo nuove funzioni:
-finestre multiple, funzione \"annulla\" multilivello, evidenziazione
-dei blocchi e altro.
+finestre multiple, funzione "annulla" multilivello, evidenziazione dei
+blocchi e altro.
 
 %description -l pl.UTF-8
 Edytor tekstu podobny do Vi. Ważne ulepszenia: możliwość pracy w wielu
@@ -335,7 +334,7 @@ zawierającą obsługę skryptów w językach Perl, Python, Ruby oraz Tcl.
 %package -n vimx
 Summary:       Vi IMproved - a Vi clone
 Summary(pl.UTF-8):     Vi IMproved - klon edytora Vi
-Group:         Applications/Editors/Vim
+Group:         X11/Applications/Editors
 Requires:      %{name}-rt = %{epoch}:%{version}-%{release}
 Provides:      vi-editor
 Provides:      vi
@@ -415,6 +414,7 @@ Requires:   rpm-whiteout >= 1.3
 Requires:      vim-plugin-securemodelines
 Obsoletes:     gvim-bonobo
 Obsoletes:     vim-common
+Obsoletes:     vim-syntax-gitcommit
 Obsoletes:     vim-syntax-upstart
 %if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
@@ -767,6 +767,7 @@ jak również GUI GTK+2.
 %patch36 -p1
 %patch37 -p1
 %patch38 -p1
+%patch39 -p1
 
 cp -p %{SOURCE20} runtime/syntax
 cp -p %{SOURCE22} runtime/syntax