From 96398d8cc173c920e7d56c349f719edf0f21a055 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Apr 13 2016 14:58:14 +0000
Subject: remove virc patch, renumber patches


---

diff --git a/vim-7.4-virc.patch b/vim-7.4-virc.patch
deleted file mode 100644
index c3a43cb..0000000
--- a/vim-7.4-virc.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- vim74/src/os_unix.h	2016-04-12 13:30:07.360022178 +0200
-+++ vim74_patched/src/os_unix.h	2016-04-13 10:41:08.780150951 +0200
-@@ -222,7 +222,7 @@
-  * Unix system-dependent file names
-  */
- #ifndef SYS_VIMRC_FILE
--# define SYS_VIMRC_FILE "/etc/vimrc"
-+# define SYS_VIMRC_FILE "/etc/virc"
- #endif
- #ifndef SYS_GVIMRC_FILE
- # define SYS_GVIMRC_FILE "/etc/gvimrc"
-@@ -266,23 +266,23 @@
- 
- #ifndef USR_VIMRC_FILE
- # ifdef VMS
--# define USR_VIMRC_FILE  "sys$login:.vimrc"
-+# define USR_VIMRC_FILE  "sys$login:.virc"
- # else
--#  define USR_VIMRC_FILE "$HOME/.vimrc"
-+#  define USR_VIMRC_FILE "$HOME/.virc"
- # endif
- #endif
- 
- 
- #if !defined(USR_VIMRC_FILE2)
- # ifdef VMS
--#  define USR_VIMRC_FILE2	"sys$login:vimfiles/vimrc"
-+#  define USR_VIMRC_FILE2	"sys$login:vimfiles/virc"
- # else
--#   define USR_VIMRC_FILE2	"~/.vim/vimrc"
-+#   define USR_VIMRC_FILE2	"~/.vim/virc"
- # endif
- #endif
- 
- #if !defined(USR_VIMRC_FILE3) && defined(VMS)
--# define USR_VIMRC_FILE3 "sys$login:_vimrc"
-+# define USR_VIMRC_FILE3 "sys$login:_virc"
- #endif
- 
- #ifndef USR_GVIMRC_FILE
-@@ -329,7 +329,7 @@
- #endif
- 
- #ifndef VIMRC_FILE
--# define VIMRC_FILE	".vimrc"
-+# define VIMRC_FILE	".virc"
- #endif
- 
- #ifdef FEAT_GUI
---- vim74/src/ex_cmds2.c	2016-04-08 11:00:52.000000000 +0200
-+++ vim74_patched/src/ex_cmds2.c	2016-04-13 10:52:24.713437801 +0200
-@@ -3696,7 +3696,7 @@
- 	 */
- 	p = gettail(fname_exp);
- 	if ((*p == '.' || *p == '_')
--		&& (STRICMP(p + 1, "vimrc") == 0
-+		&& (STRICMP(p + 1, "virc") == 0
- 		    || STRICMP(p + 1, "gvimrc") == 0
- 		    || STRICMP(p + 1, "exrc") == 0))
- 	{
diff --git a/vim.spec b/vim.spec
index 70cb330..6376753 100644
--- a/vim.spec
+++ b/vim.spec
@@ -60,8 +60,7 @@ 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
-Patch3014: vim-7.4-virc.patch
-Patch3015: vim-7.4-spec_rfc822.patch
+Patch3014: vim-7.4-spec_rfc822.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel python3-devel ncurses-devel gettext perl-devel
@@ -213,8 +212,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch3011 -p1
 %patch3012 -p1
 %patch3013 -p1
-#patch3014 -p1
-%patch3015 -p1
+%patch3014 -p1
 
 %build
 cp -f %{SOURCE5} .