- release 3 (by relup.sh)

[packages/vim.git] / vim.spec

diff --git a/vim.spec b/vim.spec
index f70fde8796877d9b65a73dcb955ff13894f0ebec..b7ea6c4912cef09f5053a645669c38f3dc6cdd4b 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -1,7 +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 @@
 # tail -n1 sources | awk '{print $2}'
 # VCS Commits: https://github.com/vim/vim/commits/master
 
-%define                ver             7.4
-%define                patchlevel      947
-%define                rel             1
+%define                ver             7.4.979
+%define                rel             3
 Summary:       Vi IMproved - a Vi clone
 Summary(de.UTF-8):     VIsual editor iMproved
 Summary(es.UTF-8):     Editor visual incrementado
@@ -44,13 +42,15 @@ Summary(ru.UTF-8):  Visual editor IMproved - Единственно Правил
 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 @@ Source31:     borland.vim
 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
@@ -89,7 +88,6 @@ Patch9:               %{name}-modprobe.patch
 Patch10:       %{name}-doubleparenthesis.patch
 Patch11:       %{name}-syntax-fstab.patch
 Patch12:       010_all_%{name}-6.3-vixie.patch
-Patch13:       013_all_%{name}-7.0-cron-vars-79981.patch
 Patch14:       020_all_%{name}-7.0-fstab-tmpfs-size.patch
 Patch15:       021_all_%{name}-7.0-fstab-bogus-errors.patch
 Patch17:       027_all_%{name}-7.0-automake-substitutions-93378.patch
@@ -173,6 +171,8 @@ Provides:   vim-editor = %{epoch}:%{version}-%{release}
 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 @@ zawierającą obsługę skryptów w językach Perl, Python, Ruby oraz Tcl
 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
@@ -760,7 +752,6 @@ jak również GUI GTK+2.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
 %patch14 -p1
 %patch15 -p1
 %patch17 -p0