From b1d4da94a985cbbaf9f090f54f2c9e4722ad0878 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 29 2020 06:59:12 +0000
Subject: import vim-7.4.629-7.el7


---

diff --git a/SPECS/vim.spec b/SPECS/vim.spec
index 2a4486f..03d1390 100644
--- a/SPECS/vim.spec
+++ b/SPECS/vim.spec
@@ -21,7 +21,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: Vim
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2
@@ -1737,13 +1737,6 @@ rm -f %{buildroot}/%{_datadir}/vim/%{vimdir}/macros/maze/maze*.c
 rm -rf %{buildroot}/%{_datadir}/vim/%{vimdir}/tools
 rm -rf %{buildroot}/%{_datadir}/vim/%{vimdir}/doc/vim2html.pl
 rm -f %{buildroot}/%{_datadir}/vim/%{vimdir}/tutor/tutor.gr.utf-8~
-( cd %{buildroot}/%{_mandir}
-  for i in `find ??/ -type f`; do
-    bi=`basename $i`
-    iconv -f latin1 -t UTF8 $i > %{buildroot}/$bi
-    mv -f %{buildroot}/$bi $i
-  done
-)
 
 # Remove not UTF-8 manpages
 for i in pl.ISO8859-2 it.ISO8859-1 ru.KOI8-R fr.ISO8859-1; do
@@ -1993,6 +1986,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Jan 21 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:7.4.629-7
+- 1743070 - manpage of vim is garbled in Japanese locale
+
 * Fri Jun 14 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:7.4.629-6
 - increment release enough to get CVE fix 1719964 for clients migrated from RHEL6