diff --git a/vim-7.0-warning.patch b/vim-7.0-warning.patch deleted file mode 100644 index fe738ca..0000000 --- a/vim-7.0-warning.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- vim70c/src/structs.h.warning1 2006-04-04 15:58:16.000000000 +0200 -+++ vim70c/src/structs.h 2006-04-04 15:58:20.000000000 +0200 -@@ -1082,7 +1082,7 @@ - { - typval_T di_tv; /* type and value of the variable */ - char_u di_flags; /* flags (only used for variable) */ -- char_u di_key[1]; /* key (actually longer!) */ -+ char_u di_key[10]; /* key (actually longer!) */ - }; - - typedef struct dictitem_S dictitem_T; diff --git a/vim.spec b/vim.spec index a0237f5..c7f5902 100644 --- a/vim.spec +++ b/vim.spec @@ -52,14 +52,12 @@ Patch3002: vim-7.4-nowarnings.patch Patch3004: vim-7.0-rclocation.patch Patch3006: vim-7.4-checkhl.patch Patch3007: vim-7.4-fstabsyntax.patch -Patch3008: vim-7.0-warning.patch -Patch3009: vim-7.4-syncolor.patch -Patch3010: vim-7.0-specedit.patch -Patch3011: vim72-rh514717.patch -Patch3012: vim-7.3-manpage-typo-668894-675480.patch -Patch3013: vim-manpagefixes-948566.patch -Patch3014: vim-7.4-licensemacro-1151450.patch -Patch3015: vim-7.4-globalsyntax.patch +Patch3008: vim-7.4-syncolor.patch +Patch3009: vim-7.0-specedit.patch +Patch3010: vim-7.3-manpage-typo-668894-675480.patch +Patch3011: vim-manpagefixes-948566.patch +Patch3012: vim-7.4-licensemacro-1151450.patch +Patch3013: vim-7.4-globalsyntax.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel python3-devel ncurses-devel gettext perl-devel @@ -206,13 +204,11 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3006 -p1 %patch3007 -p1 %patch3008 -p1 -%patch3009 -p1 -#patch3010 -p1 +#patch3009 -p1 +%patch3010 -p1 %patch3011 -p1 %patch3012 -p1 - %patch3013 -p1 -%patch3015 -p1 %build cp -f %{SOURCE5} . diff --git a/vim72-rh514717.patch b/vim72-rh514717.patch deleted file mode 100644 index e2dafa9..0000000 --- a/vim72-rh514717.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up vim72/src/eval.c.rh514717 vim72/src/eval.c ---- vim72/src/eval.c.rh514717 2009-08-03 16:15:42.882375154 +0200 -+++ vim72/src/eval.c 2009-08-03 16:34:14.863381780 +0200 -@@ -286,13 +286,12 @@ typedef struct - #define VV_RO 2 /* read-only */ - #define VV_RO_SBX 4 /* read-only in the sandbox */ - --#define VV_NAME(s, t) s, {{t, 0, {0}}, 0, {0}}, {0} -+#define VV_NAME(s, t) s, {{t, 0, {0}}, 0, {0}} - - static struct vimvar - { - char *vv_name; /* name of variable, without v: */ - dictitem_T vv_di; /* value and name for key */ -- char vv_filler[16]; /* space for LONGEST name below!!! */ - char vv_flags; /* VV_COMPAT, VV_RO, VV_RO_SBX */ - } vimvars[VV_LEN] = - { -diff -up vim72/src/structs.h.rh514717 vim72/src/structs.h ---- vim72/src/structs.h.rh514717 2009-08-03 16:33:35.274870950 +0200 -+++ vim72/src/structs.h 2009-08-03 16:33:48.607436706 +0200 -@@ -1095,7 +1095,7 @@ struct dictitem_S - { - typval_T di_tv; /* type and value of the variable */ - char_u di_flags; /* flags (only used for variable) */ -- char_u di_key[10]; /* key (actually longer!) */ -+ char_u di_key[18]; /* key */ - }; - - typedef struct dictitem_S dictitem_T;