updated to 7.4.873

[packages/vim.git] / vim.spec

diff --git a/vim.spec b/vim.spec
index b0f2345e07854b20245e4f3c2a30f0102011dc6e..c3af24fb9bf2afd1932f03c59edfd0beb54cb5ed 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -28,8 +28,8 @@
 # VCS Commits: https://code.google.com/p/vim/source/browse/
 
 %define                ver             7.4
-%define                patchlevel      663
-%define                rel             2
+%define                patchlevel      873
+%define                rel             1
 Summary:       Vi IMproved - a Vi clone
 Summary(de.UTF-8):     VIsual editor iMproved
 Summary(es.UTF-8):     Editor visual incrementado
@@ -89,7 +89,6 @@ Patch12:      010_all_%{name}-6.3-vixie.patch
 Patch13:       013_all_%{name}-7.0-cron-vars-79981.patch
 Patch14:       020_all_%{name}-7.0-fstab-tmpfs-size.patch
 Patch15:       021_all_%{name}-7.0-fstab-bogus-errors.patch
-Patch16:       024_all_%{name}-6.3-bash-83565.patch
 Patch17:       027_all_%{name}-7.0-automake-substitutions-93378.patch
 Patch18:       %{name}-smarty.patch
 Patch19:       %{name}-tutor-lessdeps.patch
@@ -104,7 +103,6 @@ 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
@@ -116,11 +114,12 @@ Patch39:  %{name}-revert-7.4.165-noundo.patch
 URL:           http://www.vim.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
-BuildRequires: gettext-tools
 BuildRequires: gpm-devel
 %if "%{pld_release}" == "ac"
 %{?with_athena:BuildRequires:  XFree86-devel}
+BuildRequires: gettext-devel
 %else
+BuildRequires: gettext-tools
 %{?with_athena:BuildRequires:  xorg-lib-libXaw-devel}
 %endif
 %if %{with gtk} || %{with heavy}
@@ -138,6 +137,7 @@ BuildRequires:      perl-devel
 %endif
 %if %{with python} || %{with heavy}
 BuildRequires: python-devel
+BuildRequires: rpm-pythonprov
 %endif
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.426
@@ -738,7 +738,11 @@ jak również GUI GTK+2.
 %setup -q -n %{name}74
 
 # official patches
-%patchset_patch 1 %{patchlevel}
+# patches 7.4.802, 7.4.809 do not apply
+# 7.4.802 does not apply and 7.4.809 attempts to revert 7.4.802
+%patchset_patch 1 801
+%patchset_patch 803 808
+%patchset_patch 810 %{patchlevel}
 
 %patch0 -p1
 %patch1 -p1
@@ -756,7 +760,6 @@ jak również GUI GTK+2.
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
-%patch16 -p0
 %patch17 -p0
 %patch18 -p1
 %patch19 -p1
@@ -774,7 +777,6 @@ jak również GUI GTK+2.
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
-%patch31 -p1
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1