From 6029d7529df02e9ee002850ad3b0fd98d8976bcb84012154b3dd81924057e37b Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Thu, 26 Jan 2023 09:00:11 +0000
Subject: [PATCH] Accepting request 1061128 from
 home:jirislaby:branches:editors

- drop vim-8.0-ttytype-test.patch as it changes test_options.vim which we
  remove during %prep anyway. And this breaks quilt setup.

OBS-URL: https://build.opensuse.org/request/show/1061128
OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=778
---
 vim-8.0-ttytype-test.patch | 13 -------------
 vim.changes                |  6 ++++++
 vim.spec                   |  2 --
 3 files changed, 6 insertions(+), 15 deletions(-)
 delete mode 100644 vim-8.0-ttytype-test.patch

diff --git a/vim-8.0-ttytype-test.patch b/vim-8.0-ttytype-test.patch
deleted file mode 100644
index a273f68..0000000
--- a/vim-8.0-ttytype-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: vim-8.2.2411/src/testdir/test_options.vim
-===================================================================
---- vim-8.2.2411.orig/src/testdir/test_options.vim
-+++ vim-8.2.2411/src/testdir/test_options.vim
-@@ -496,7 +496,7 @@ func Test_set_ttytype()
-   " check for failure of finding the entry and for missing 'cm' entry.
-   try
-     set ttytype=xxx
--    call assert_report('set ttytype=xxx did not fail')
-+    "call assert_report('set ttytype=xxx did not fail')
-   catch /E522\|E437/
-   endtry
- 
diff --git a/vim.changes b/vim.changes
index 0ad8a98..e2b74ed 100644
--- a/vim.changes
+++ b/vim.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 26 07:49:28 UTC 2023 - Jiri Slaby <jslaby@suse.cz>
+
+- drop vim-8.0-ttytype-test.patch as it changes test_options.vim which we
+  remove during %prep anyway. And this breaks quilt setup.
+
 -------------------------------------------------------------------
 Mon Jan 23 11:39:22 UTC 2023 - Ondřej Súkup <mimi.vx@gmail.com>
 
diff --git a/vim.spec b/vim.spec
index 9b024fb..7e5c901 100644
--- a/vim.spec
+++ b/vim.spec
@@ -71,7 +71,6 @@ Patch15:        %{name}-7.4-filetype_apparmor.patch
 Patch18:        %{name}-7.3-filetype_spec.patch
 Patch21:        %{name}-7.3-filetype_changes.patch
 Patch22:        %{name}-7.4-filetype_mine.patch
-Patch23:        vim-8.0-ttytype-test.patch
 Patch24:        disable-unreliable-tests.patch
 Patch25:        ignore-flaky-test-failure.patch
 Patch100:       vim73-no-static-libpython.patch
@@ -211,7 +210,6 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim
 %patch18 -p1
 %patch21 -p1
 %patch22 -p1
-%patch23 -p1
 %patch24 -p1
 %patch25 -p1
 %patch100 -p1