[vim: 2/2] merge and fix help file names

[Karsten Hopp]

commit ec7bccb6b5c256799c34f52b4057b38d319ac682
Merge: 8892520 627c441
Author: Karsten Hopp <karsten at redhat.com>
Date:   Fri Aug 22 11:36:45 2014 +0200

    merge and fix help file names

 vim.spec |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --cc vim.spec
index a5c4d04,0e1b6fd..f59c1a4
--- a/vim.spec
+++ b/vim.spec
@@@ -21,7 -21,7 +21,7 @@@ Summary: The VIM edito
  URL:     http://www.vim.org/
  Name: vim
  Version: %{baseversion}.%{patchlevel}
--Release: 2%{?dist}
++Release: 3%{?dist}
  License: Vim
  Group: Applications/Editors
  Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2
@@@ -46,8 -46,8 +46,7 @@@ Patch2003: vim-6.2-specsyntax.patc
  Patch2011: vim-7.0-hunspell.patch
  BuildRequires: hunspell-devel
  %endif
--# If you're as lazy as me, generate the list using
--# for i in `seq 1 14`; do printf "Patch%03d: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.%03d\n" $i $i; done
++
  Patch001: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.001
  Patch002: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.002
  Patch003: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.003
@@@ -597,7 -597,7 +596,6 @@@ chmod -x runtime/tools/mve.aw
  perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
  
  # Base patches...
--# for i in `seq 1 14`; do printf "%%patch%03d -p0 \n" $i; done
  %patch001 -p0
  %patch002 -p0
  %patch003 -p0
@@@ -1519,9 -1514,9 +1517,13 @@@ rm -rf %{buildroot
  %{_datadir}/icons/hicolor/*/apps/*
  
  %changelog
- * Fri Aug 15 2014 Karsten Hopp <karsten at redhat.com> 7.4.402-2
++* Fri Aug 22 2014 Karsten Hopp <karsten at redhat.com> 7.4.402-3
 +- fix help file names
 +
+ * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:7.4.402-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+ 
++
  * Wed Aug 13 2014 Karsten Hopp <karsten at redhat.com> 7.4.402-1
  - patchlevel 402