From 245422c6e57984e7604b539aafbf1cbcd3ee3852 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Jan 15 2015 14:55:38 +0000
Subject: fix broken 559 patch


---

diff --git a/7.4.559 b/7.4.559
index c4b4c3c..7425f53 100644
--- a/7.4.559
+++ b/7.4.559
@@ -59,36 +59,6 @@ Files:	    src/ops.c, src/testdir/test39.in, src/testdir/test39.ok
   	}
   #endif
   
-*** ../vim-7.4.558/src/testdir/test39.in	2014-12-17 14:36:10.363090985 +0100
---- src/testdir/test39.in	2014-12-17 18:27:18.151974111 +0100
-***************
-*** 38,48 ****
-  /^C23$/
-  :exe ":norm! l\<C-V>j$hhAab\<Esc>"
-  :.,/^$/w >> test.out
-! :" Test for Visual block insert when virtualedit=all
-! :set ve=all
-  :/\t\tline
-  :exe ":norm! 07l\<C-V>jjIx\<Esc>"
-! :set ve=
-  :.,/^$/w >> test.out
-  :" gUe must uppercase a whole word, also when ß changes to SS
-  Gothe youtußeuu endYpk0wgUe
---- 38,51 ----
-  /^C23$/
-  :exe ":norm! l\<C-V>j$hhAab\<Esc>"
-  :.,/^$/w >> test.out
-! :" Test for Visual block insert when virtualedit=all and utf-8 encoding
-! :set ve=all enc=utf-8
-  :/\t\tline
-  :exe ":norm! 07l\<C-V>jjIx\<Esc>"
-! :.,/^$/w >> test.out
-! :" Test for Visual block append when virtualedit=all
-! :exe ":norm! 012l\<C-v>jjAx\<Esc>"
-! :set ve= enc=latin1
-  :.,/^$/w >> test.out
-  :" gUe must uppercase a whole word, also when ß changes to SS
-  Gothe youtußeuu endYpk0wgUe
 *** ../vim-7.4.558/src/testdir/test39.ok	2014-08-16 18:13:00.082044726 +0200
 --- src/testdir/test39.ok	2014-12-17 18:18:33.090470463 +0100
 ***************
diff --git a/7.4.559.rhpatched b/7.4.559.rhpatched
new file mode 100644
index 0000000..cd66fa2
--- /dev/null
+++ b/7.4.559.rhpatched
@@ -0,0 +1,20 @@
+--- src/testdir/test39.in.orig	2015-01-15 15:41:19.391952838 +0100
++++ src/testdir/test39.in	2015-01-15 15:46:39.565881372 +0100
+@@ -38,11 +38,14 @@
+ /^C23$/
+ :exe ":norm! l\<C-V>j$hhAab\<Esc>"
+ :.,/^$/w >> test.out
+-:" Test for Visual block insert when virtualedit=all
+-:set ve=all
++:" Test for Visual block insert when virtualedit=all and utf-8 encoding
++:set ve=all enc=utf-8
+ :/\t\tline
+ :exe ":norm! 07l\<C-V>jjIx\<Esc>"
+-:set ve=
++:.,/^$/w >> test.out
++:" Test for Visual block append when virtualedit=all
++:exe ":norm! 012l\<C-v>jjAx\<Esc>"
++:set ve= enc=latin1
+ :.,/^$/w >> test.out
+ :" gUe must uppercase a whole word, also when � changes to SS
+ Gothe youtu�euu endYpk0wgUe
diff --git a/spec-template.new b/spec-template.new
index cea6bfc..d995348 100644
--- a/spec-template.new
+++ b/spec-template.new
@@ -24,7 +24,7 @@ make %{?_smp_mflags}
 
 
 %install
-make install DESTDIR=%{buildroot}
+%make_install
 
 
 %files
diff --git a/vim.spec b/vim.spec
index 13e3e41..d5288d0 100644
--- a/vim.spec
+++ b/vim.spec
@@ -624,6 +624,7 @@ Patch574: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.574
 Patch575: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.575
 Patch576: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.576
 
+Patch1559: 7.4.559.rhpatched
 Patch3000: vim-7.4-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
 Patch3004: vim-7.0-rclocation.patch
@@ -1329,6 +1330,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch557 -p0
 %patch558 -p0
 %patch559 -p0
+%patch1559 -p0
 %patch560 -p0
 %patch561 -p0
 %patch562 -p0