X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=vim.spec;h=b7ea6c4912cef09f5053a645669c38f3dc6cdd4b;hb=8f69654cd4ddc7142deefcae811c4f313d0259ea;hp=7b4c963e2da04c46b14b69e0a4d0d8492737ad8a;hpb=16bc28c1c281bd157fe2c825ea3eda7ee06a7009;p=packages%2Fvim.git

diff --git a/vim.spec b/vim.spec
index 7b4c963..b7ea6c4 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,3 +1,5 @@
+# TODO
+# - use upstream gvim.desktop as base for our gvim .desktop files (more translations)
 #
 # Conditional build:
 %bcond_without	static		# don't build static version
@@ -25,11 +27,10 @@
 # Command to check for latest patch:
 # wget ftp://ftp.vim.org/pub/editors/vim/patches/7.4/MD5SUMS -O sources
 # tail -n1 sources | awk '{print $2}'
-# VCS Commits: https://code.google.com/p/vim/source/browse/
+# VCS Commits: https://github.com/vim/vim/commits/master
 
-%define		ver		7.4
-%define		patchlevel	761
-%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
@@ -41,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
@@ -72,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
@@ -86,10 +88,8 @@ 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
-Patch16:	024_all_%{name}-6.3-bash-83565.patch
 Patch17:	027_all_%{name}-7.0-automake-substitutions-93378.patch
 Patch18:	%{name}-smarty.patch
 Patch19:	%{name}-tutor-lessdeps.patch
@@ -104,7 +104,6 @@ Patch27:	%{name}-autopaste.patch
 Patch28:	%{name}-ft-cron.patch
 Patch29:	%{name}-phpscript.patch
 Patch30:	%{name}-pam.patch
-Patch31:	%{name}-ft-bash.patch
 Patch32:	%{name}-localedir.patch
 Patch33:	%{name}-locales.patch
 Patch34:	%{name}-rtdir.patch
@@ -172,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
@@ -737,11 +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
-%patchset_patch 1 %{patchlevel}
-
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -755,10 +752,8 @@ jak również GUI GTK+2.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
 %patch14 -p1
 %patch15 -p1
-%patch16 -p0
 %patch17 -p0
 %patch18 -p1
 %patch19 -p1
@@ -776,7 +771,6 @@ jak również GUI GTK+2.
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
-%patch31 -p1
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
@@ -975,6 +969,9 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/vim,%{_bindir}} \
 %{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# generic gvim from upstream, but we have bunch of subpackages
+%{__rm} $RPM_BUILD_ROOT%{_desktopdir}/gvim.desktop
+
 # not supported locales added by 7.3.764 or later
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/cs.cp1250
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ja.sjis