Merge branch 'use-git'

diff --cc vim.spec
index d131200d54c673979bd02a32ffb2313e1be60917,e6e3c1f8116bfc60a4c3cd293886c56af90fa751..cb005278f59f83a95891e7ecfd442654f7c60503
--- 1/vim.spec
--- 2/vim.spec
+++ b/vim.spec
@@@ -30,9 -29,8 +29,8 @@@
  # tail -n1 sources | awk '{print $2}'
  # VCS Commits: https://github.com/vim/vim/commits/master
  
- %define               ver             7.4
- %define               patchlevel      979
+ %define               ver             7.4.979
 -%define               rel             0.2
 +%define               rel             1
  Summary:      Vi IMproved - a Vi clone
  Summary(de.UTF-8):    VIsual editor iMproved
  Summary(es.UTF-8):    Editor visual incrementado