From 9a11303e92ae1c656765bf64186dd1ddc075e0c1 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Apr 08 2019 11:24:22 +0000 Subject: - patchlevel 1137 --- diff --git a/.gitignore b/.gitignore index 347de0a..c0c7f97 100644 --- a/.gitignore +++ b/.gitignore @@ -251,3 +251,4 @@ /vim-8.1-998.tar.bz2 /vim-8.1-1048.tar.bz2 /vim-8.1-1099.tar.bz2 +/vim-8.1-1137.tar.bz2 diff --git a/0001-Typo-in-gvim.desktop-file.patch b/0001-Typo-in-gvim.desktop-file.patch new file mode 100644 index 0000000..0b35a64 --- /dev/null +++ b/0001-Typo-in-gvim.desktop-file.patch @@ -0,0 +1,25 @@ +From 89454405df6d9a3063267ca28e07498bcda77b18 Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +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 + diff --git a/sources b/sources index 5d9a177..4ed6f37 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-1099.tar.bz2) = 7236a7ba038457676340dbeb1762c7229571be2d25374febfd900dedf56a90591d49d5a397048f8ed3ad70e33461c8288c5c91b2803b9c18d205c909d7571779 +SHA512 (vim-8.1-1137.tar.bz2) = 0b59930e42de45454a170a9dbc6df6ba6a04475e00eb682c4e9215dac57c3c9536c12ca1bf565b74d9c643123dd4b035825010bd1364ba56cd3d660f84498487 diff --git a/vim.spec b/vim.spec index 9d146a7..8a808b9 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1099 +%define patchlevel 1137 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -21,7 +21,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -61,6 +61,8 @@ 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 @@ -253,6 +255,7 @@ 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 @@ -794,6 +797,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Apr 08 2019 Zdenek Dohnal - 2:8.1.1137-1 +- patchlevel 1137 + * Mon Apr 08 2019 Zdenek Dohnal - 2:8.1.1099-2 - 1697104 - new spec file template contains deprecated tags