From adc9d5c6252260acd4cd1074f36b058a9199e692 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Jun 11 2019 08:01:31 +0000
Subject: remove desktop patch, already in upstream


---

diff --git a/vim-desktop-duplicate-entries.patch b/vim-desktop-duplicate-entries.patch
deleted file mode 100644
index b1cd9a4..0000000
--- a/vim-desktop-duplicate-entries.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/po/gvim.desktop.in b/src/po/gvim.desktop.in
-index 7d5234851..b547598e8 100644
---- a/src/po/gvim.desktop.in
-+++ b/src/po/gvim.desktop.in
-@@ -10,7 +10,6 @@ Comment=Edit text files
- # The translations should come from the po file. Leave them here for now, they will
- # be overwritten by the po file when generating the desktop.file!
- GenericName[da]=Teksteditor
--GenericName[eo]=Tekstoredaktilo
- GenericName[fr]=Éditeur de texte
- GenericName[pl]=Edytor tekstu
- GenericName[is]=Ritvinnsluforrit
-@@ -29,7 +28,6 @@ Comment[da]=Rediger tekstfiler
- Comment[el]=Επεξεργασία αρχείων κειμένου
- Comment[en_CA]=Edit text files
- Comment[en_GB]=Edit text files
--Comment[eo]=Redakti tekstajn dosierojn
- Comment[es]=Edita archivos de texto
- Comment[et]=Redigeeri tekstifaile
- Comment[eu]=Editatu testu-fitxategiak
diff --git a/vim.spec b/vim.spec
index 84cc030..a243609 100644
--- a/vim.spec
+++ b/vim.spec
@@ -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
-# duplicate desktop entries
-Patch3018: vim-desktop-duplicate-entries.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
@@ -793,6 +790,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Tue Jun 11 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1471-2
+- remove desktop patch, already in upstream
+
 * Thu Jun 06 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1471-1
 - patchlevel 1471