updated to 7.4.205

[packages/vim.git] / vim.spec

diff --git a/vim.spec b/vim.spec
index 8efc5d6ca5103cd0629ea158517b9a9074c4cd35..e7b317d3669dacc3e9bce272fa00575b518c5c6a 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -27,8 +27,8 @@
 # VCS Commits: https://code.google.com/p/vim/source/browse/
 
 %define                ver             7.4
-%define                patchlevel      023
-%define                rel             3
+%define                patchlevel      205
+%define                rel             1
 Summary:       Vi IMproved - a Vi clone
 Summary(de.UTF-8):     VIsual editor iMproved
 Summary(es.UTF-8):     Editor visual incrementado
@@ -97,21 +97,21 @@ Patch21:    %{name}-filetypes.patch
 Patch22:       %{name}-man_installation.patch
 Patch23:       %{name}-vimrc.patch
 Patch24:       %{name}-syntax-exports.patch
-
-Patch102:      %{name}-gtkfilechooser.patch
-Patch104:      %{name}-home_etc.patch
-Patch105:      %{name}-autopaste.patch
-Patch106:      %{name}-ft-cron.patch
-Patch108:      %{name}-phpscript.patch
-Patch109:      %{name}-pam.patch
-Patch110:      %{name}-ft-bash.patch
-Patch112:      %{name}-localedir.patch
-Patch113:      %{name}-locales.patch
-Patch114:      %{name}-rtdir.patch
-Patch115:      %{name}-ft-mib.patch
-Patch116:      %{name}-ft-lib-udevrules.patch
-Patch117:      %{name}-ft-mysql.patch
-Patch118:      %{name}-ft-gyp.patch
+Patch25:       sudoers-include.patch
+Patch26:       %{name}-home_etc.patch
+Patch27:       %{name}-autopaste.patch
+Patch28:       %{name}-ft-cron.patch
+Patch29:       %{name}-phpscript.patch
+Patch30:       %{name}-pam.patch
+Patch31:       %{name}-ft-bash.patch
+Patch32:       %{name}-localedir.patch
+Patch33:       %{name}-locales.patch
+Patch34:       %{name}-rtdir.patch
+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
@@ -129,8 +129,8 @@ BuildRequires:      gtk+2-devel >= 2:2.6.0
 %if %{with selinux} || %{with heavy}
 BuildRequires: libselinux-devel
 %endif
+%{?with_motif:BuildRequires:   motif-devel}
 BuildRequires: ncurses-devel
-%{?with_motif:BuildRequires:   openmotif-devel}
 BuildRequires: pkgconfig
 %if %{with perl} || %{with heavy}
 BuildRequires: perl-devel
@@ -169,7 +169,6 @@ 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
@@ -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,8 @@ 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
 %endif
@@ -749,26 +750,24 @@ jak również GUI GTK+2.
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-
-# home etc
-%{?with_home_etc:%patch104 -p1}
+%patch25 -p1
+%{?with_home_etc:%patch26 -p1}
 
 # autopaste patch - automatically switch to paste mode
 # when `really fast typing' situation happens
-%patch105 -p1
-
-%patch106 -p1
-
-%patch108 -p1
-%patch109 -p1
-%patch110 -p1
-%patch112 -p1
-%patch113 -p1
-%patch114 -p1
-%patch115 -p1
-%patch116 -p1
-%patch117 -p1
-%patch118 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
 
 cp -p %{SOURCE20} runtime/syntax
 cp -p %{SOURCE22} runtime/syntax
@@ -1162,6 +1161,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vim/gvimrc
 
 %dir %{_datadir}/vim
+%dir %{_datadir}/vim/doc
 
 %dir %{_datadir}/vim/vimfiles
 %dir %{_datadir}/vim/vimfiles/doc
@@ -1292,8 +1292,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files doc
 %defattr(644,root,root,755)
-%dir %{_datadir}/vim/doc
-
 # English
 %{_datadir}/vim/doc/*.txt.gz
 %verify(not md5 mtime size) %{_datadir}/vim/doc/tags