Merge branch 'use-git'

diff --combined vim.spec
index d131200d54c673979bd02a32ffb2313e1be60917,e6e3c1f8116bfc60a4c3cd293886c56af90fa751..cb005278f59f83a95891e7ecfd442654f7c60503
--- 1/vim.spec
--- 2/vim.spec
+++ b/vim.spec
@@@ -1,7 -1,6 +1,6 @@@
  # TODO
  # - use upstream gvim.desktop as base for our gvim .desktop files (more translations)
  #
- #
  # Conditional build:
  %bcond_without        static          # don't build static version
  %bcond_without        athena          # don't build Athena Widgets-based gvim
@@@ -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
@@@ -44,13 -42,15 +42,15 @@@ Summary(ru.UTF-8): Visual editor IMprov
  Summary(tr.UTF-8):    Gelişmiş bir vi sürümü
  Summary(uk.UTF-8):    Visual editor IMproved - Єдино Вірний Редактор :)
  Name:         vim
- Version:      %{ver}.%{patchlevel}
+ Version:      %{ver}
+ # keep macro for release, otherwise people tend to increment Epoch instead
  Release:      %{rel}
  Epoch:                4
  License:      Charityware
  Group:                Applications/Editors/Vim
- Source0:      ftp://ftp.vim.org/pub/vim/unix/%{name}-%{ver}.tar.bz2
- # Source0-md5:        607e135c559be642f210094ad023dc65
+ #Source0:     ftp://ftp.vim.org/pub/vim/unix/%{name}-%{ver}.tar.bz2
+ Source0:      https://github.com/vim/vim/archive/v%{ver}.tar.gz
+ # Source0-md5:        dc289e3d5dd1b25e1e976ce7e704b47c
  Source1:      http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
  # Source1-md5:        bc4d1e115ca506ad7751b9bd2b773a7f
  Source2:      http://skawina.eu.org/mikolaj/usr_doc_pl.zip
@@@ -75,7 -75,6 +75,6 @@@ Source31:     borland.vi
  Source32:     oceandeep.vim
  # http://www.vim.org/scripts/script.php?script_id=1464 (2.6.3)
  Source33:     moria.vim
- %patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/%{ver}/%{ver}.%03g 1 %{patchlevel}
  Patch0:               %{name}-sysconfdir.patch
  Patch1:               %{name}-visual.patch
  Patch2:               %{name}-paths.patch
@@@ -113,7 -112,6 +112,6 @@@ Patch36:   %{name}-ft-lib-udevrules.patc
  Patch37:      %{name}-ft-mysql.patch
  Patch38:      %{name}-ft-gyp.patch
  Patch39:      %{name}-revert-7.4.165-noundo.patch
- Patch40:      bug-512.patch
  URL:          http://www.vim.org/
  BuildRequires:        acl-devel
  BuildRequires:        autoconf
@@@ -173,6 -171,8 +171,8 @@@ Provides:  vim-editor = %{epoch}:%{versi
  Obsoletes:    vim-enhanced
  Obsoletes:    vim-ispell
  Obsoletes:    vim-plugin-multvals
+ Obsoletes:    vim-syntax-golang <= 1.3.3-1
+ Obsoletes:    vim-syntax-lxc-docker <= 0.9.0-1
  BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
  
  # configure redefines it to =1
@@@ -738,15 -738,7 +738,7 @@@ zawierającą obsługę skryptów w ję
  jak również GUI GTK+2.
  
  %prep
- %setup -q -n %{name}74
- 
- # official patches
- # patches 7.4.802, 7.4.809 do not apply
- # 7.4.802 does not apply and 7.4.809 attempts to revert 7.4.802
- %patchset_patch 1 801
- %patchset_patch 803 808
- %patchset_patch 810 %{patchlevel}
- 
+ %setup -q
  %patch0 -p1
  %patch1 -p1
  %patch2 -p1
@@@ -787,7 -779,6 +779,6 @@@
  %patch37 -p1
  %patch38 -p1
  %patch39 -p1
- %patch40 -p1
  
  cp -p %{SOURCE20} runtime/syntax
  cp -p %{SOURCE22} runtime/syntax