remove upstream patch

This commit is contained in:
Zdenek Dohnal 2019-05-20 09:15:37 +02:00
parent 9a11303e92
commit 41acf19b5f
2 changed files with 4 additions and 29 deletions

View File

@ -1,25 +0,0 @@
From 89454405df6d9a3063267ca28e07498bcda77b18 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Mon, 8 Apr 2019 13:04:31 +0200
Subject: [PATCH] Typo in gvim.desktop file.
---
runtime/gvim.desktop | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/runtime/gvim.desktop b/runtime/gvim.desktop
index 945bfb9bc..095ddb564 100644
--- a/runtime/gvim.desktop
+++ b/runtime/gvim.desktop
@@ -6,7 +6,7 @@ GenericName[de]=Texteditor
GenericName[eo]=Tekstoredaktilo
GenericName[fr]=Éditeur de texte
GenericName[pl]=Edytor tekstu
-GenericName[is}=Ritvinnsluforrit
+GenericName[is]=Ritvinnsluforrit
Comment=Edit text files
Comment[af]=Redigeer tekslêers
Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
--
2.20.1

View File

@ -21,7 +21,7 @@ Summary: The VIM editor
URL: http://www.vim.org/
Name: vim
Version: %{baseversion}.%{patchlevel}
Release: 1%{?dist}
Release: 2%{?dist}
License: Vim and MIT
Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
Source1: vim.sh
@ -61,8 +61,6 @@ Patch3014: vim-7.4-releasestring-1318991.patch
Patch3016: vim-8.0-copy-paste.patch
# migrate shebangs in script to /usr/bin/python3 and use python2 when necessary
Patch3017: vim-python3-tests.patch
# typo introduced in the latest upstream commit, reported upstream with patch
Patch3018: 0001-Typo-in-gvim.desktop-file.patch
# gcc is no longer in buildroot by default
BuildRequires: gcc
@ -255,7 +253,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch3014 -p1
%patch3016 -p1
%patch3017 -p1
%patch3018 -p1
%build
%if 0%{?rhel} > 7
@ -797,6 +794,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
%{_datadir}/icons/locolor/*/apps/*
%changelog
* Mon May 20 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1137-2
- remove upstream patch
* Mon Apr 08 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1137-1
- patchlevel 1137