From 931a877b9784e77c0a10b91bead69aba83397727 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Fri, 19 Apr 2013 13:13:36 +0200 Subject: [PATCH 1/2] upstream patch was broken, re-commit --- 7.3.838 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/7.3.838 b/7.3.838 index 02ad2ae2..7ecfc00c 100644 --- a/7.3.838 +++ b/7.3.838 @@ -207,9 +207,9 @@ Files: src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak, + four leadinG spaces + two consecutive tabs + two tabs in one line -+ one … multibyteCharacter -+ a “b” two multiByte characters -+ “c”1€ three mulTibyte characters ++ one … multibyteCharacter ++ a “b” two multiByte characters ++ “c”1€ three mulTibyte characters *** ../vim-7.3.837/src/testdir/test92.ok 2013-02-26 17:20:44.000000000 +0100 --- src/testdir/test92.ok 2013-02-26 17:13:48.000000000 +0100 *************** From 64f562360e1106bec413c7dead25355ed91f5d24 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Fri, 19 Apr 2013 13:35:16 +0200 Subject: [PATCH 2/2] drop crv patch update 7.3.838 patch, it was broken upstream --- vim-7.0-crv.patch | 10 ---------- vim.spec | 6 ++++-- 2 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 vim-7.0-crv.patch diff --git a/vim-7.0-crv.patch b/vim-7.0-crv.patch deleted file mode 100644 index 416c64ee..00000000 --- a/vim-7.0-crv.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- vim70aa/src/term.c.orig 2006-03-14 15:40:15.000000000 +0100 -+++ vim70aa/src/term.c 2006-03-14 15:43:54.000000000 +0100 -@@ -1284,7 +1284,6 @@ - {(int)KS_CWS, "[%dCWS%d]"}, - {(int)KS_CWP, "[%dCWP%d]"}, - # endif -- {(int)KS_CRV, "[CRV]"}, - {K_UP, "[KU]"}, - {K_DOWN, "[KD]"}, - {K_LEFT, "[KL]"}, diff --git a/vim.spec b/vim.spec index dcc04fbb..2279e412 100644 --- a/vim.spec +++ b/vim.spec @@ -46,7 +46,6 @@ Source16: nl.po Patch2002: vim-7.0-fixkeys.patch Patch2003: vim-6.2-specsyntax.patch -Patch2004: vim-7.0-crv.patch %if %{withhunspell} Patch2011: vim-7.0-hunspell.patch BuildRequires: hunspell-devel @@ -1097,7 +1096,6 @@ vim-common package. chmod -x runtime/tools/mve.awk %patch2002 -p1 %patch2003 -p1 -%patch2004 -p1 %if %{withhunspell} %patch2011 -p1 %endif @@ -2484,6 +2482,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* Fri Apr 19 2013 Karsten Hopp 7.3.903-1 +- drop crv patch +- update 7.3.838 patch, it was broken upstream + * Mon Apr 15 2013 Karsten Hopp 7.3.903-1 - patchlevel 903