X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=vim.spec;h=3d69e4f31d2bec871a9b3a0ea1b79a9197e07ff7;hb=49168b34d2195ee4221ab406d2482e04d7860517;hp=bdd740ad477a1606fd375f90044fbbf93ac8313c;hpb=fb0ab3adb9944debfb816c6c22abe825fcdcdb24;p=packages%2Fvim.git

diff --git a/vim.spec b/vim.spec
index bdd740a..3d69e4f 100644
--- a/vim.spec
+++ b/vim.spec
@@ -8,6 +8,7 @@
 %bcond_without	heavy		# don't build heavy (full-featured GNOME-based gvim/vim)
 %bcond_without	gui		# don't build any GUI
 %bcond_without	light		# don't build light (minimal, ncurses, but not static)
+%bcond_with	lua		# with Lua interp in vim package
 %bcond_with	perl		# with Perl interp in vim package
 %bcond_with	python		# with Python interp in vim package
 %bcond_with	ruby		# with Ruby interp in vim package
@@ -25,11 +26,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	273
-%define		rel		1
+%define		ver		7.4.1236
+%define		rel		2
 Summary:	Vi IMproved - a Vi clone
 Summary(de.UTF-8):	VIsual editor iMproved
 Summary(es.UTF-8):	Editor visual incrementado
@@ -41,22 +41,19 @@ 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:	bca123584eb843c485c687861d54ad27
 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
 # Source2-md5:	ff96284b1c913d55cf0877839b34d490
-Source10:	g%{name}-athena.desktop
-Source11:	g%{name}-motif.desktop
-Source12:	g%{name}-gtk.desktop
-Source13:	g%{name}-gnome.desktop
-Source14:	%{name}.desktop
 Source15:	update-source.sh
 # syntax files
 # http://www.vim.org/scripts/script.php?script_id=1491 (0.7.5)
@@ -72,7 +69,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 +82,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 +98,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
@@ -113,14 +106,17 @@ Patch36:	%{name}-ft-lib-udevrules.patch
 Patch37:	%{name}-ft-mysql.patch
 Patch38:	%{name}-ft-gyp.patch
 Patch39:	%{name}-revert-7.4.165-noundo.patch
+Patch40:	desktop.patch
+Patch41:	%{name}-lua.patch
 URL:		http://www.vim.org/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf
-BuildRequires:	gettext-devel
 BuildRequires:	gpm-devel
 %if "%{pld_release}" == "ac"
 %{?with_athena:BuildRequires:	XFree86-devel}
+BuildRequires:	gettext-devel
 %else
+BuildRequires:	gettext-tools
 %{?with_athena:BuildRequires:	xorg-lib-libXaw-devel}
 %endif
 %if %{with gtk} || %{with heavy}
@@ -130,6 +126,9 @@ BuildRequires:	gtk+2-devel >= 2:2.6.0
 %if %{with selinux} || %{with heavy}
 BuildRequires:	libselinux-devel
 %endif
+%if %{with lua} || %{with heavy}
+BuildRequires:	lua52-devel
+%endif
 %{?with_motif:BuildRequires:	motif-devel}
 BuildRequires:	ncurses-devel
 BuildRequires:	pkgconfig
@@ -138,6 +137,7 @@ BuildRequires:	perl-devel
 %endif
 %if %{with python} || %{with heavy}
 BuildRequires:	python-devel
+BuildRequires:	rpm-pythonprov
 %endif
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.426
@@ -170,6 +170,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
@@ -735,10 +737,12 @@ 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
+%setup -q
 
-# official patches
-%patchset_patch 1 %{patchlevel}
+cp -p runtime/gvim.desktop gvim-athena.desktop
+cp -p runtime/gvim.desktop gvim-gnome.desktop
+cp -p runtime/gvim.desktop gvim-gtk.desktop
+cp -p runtime/gvim.desktop gvim-motif.desktop
 
 %patch0 -p1
 %patch1 -p1
@@ -753,10 +757,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
@@ -774,7 +776,6 @@ jak również GUI GTK+2.
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
-%patch31 -p1
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
@@ -783,6 +784,8 @@ jak również GUI GTK+2.
 %patch37 -p1
 %patch38 -p1
 %patch39 -p1
+%patch40 -p1
+%patch41 -p1
 
 cp -p %{SOURCE20} runtime/syntax
 cp -p %{SOURCE22} runtime/syntax
@@ -805,6 +808,12 @@ cp -p %{SOURCE32} runtime/colors
 %{__mv} runtime/lang/menu_n{o,b}_no.latin1.vim
 %{__mv} runtime/lang/menu_n{o,b}_no.utf-8.vim
 
+# not info files but some binary files for Amiga:
+# Amiga Workbench drawer icon
+# Amiga Workbench project icon
+# Amiga Workbench tool icon
+find -name '*.info' | xargs rm -v
+
 %build
 cd src
 %{__autoconf}
@@ -824,9 +833,10 @@ build() {
 		--with-tlib="ncursesw"
 %endif
 
-	%{__make} distclean
+	%{__make} -j1 distclean
 	# add common options, can override (disable) if needed with args
 	%configure \
+		--%{!?with_lua:dis}%{?with_lua:en}able-luainterp \
 		--%{!?with_perl:dis}%{?with_perl:en}able-perlinterp \
 		--%{!?with_python:dis}%{?with_python:en}able-pythoninterp \
 		--%{!?with_ruby:dis}%{?with_ruby:en}able-rubyinterp \
@@ -855,6 +865,7 @@ build vim.static \
 	--disable-gui \
 	--without-x \
 	--with-features=small \
+	--disable-luainterp \
 	--disable-perlinterp \
 	--disable-pythoninterp \
 	--disable-rubyinterp \
@@ -872,6 +883,7 @@ build vim.light \
 	--disable-gui \
 	--without-x \
 	--with-features=small \
+	--disable-luainterp \
 	--disable-perlinterp \
 	--disable-pythoninterp \
 	--disable-rubyinterp \
@@ -941,6 +953,7 @@ build vim.heavy \
 	--with-features=huge \
 	--disable-gui \
 	--without-x \
+	--enable-luainterp \
 	--enable-perlinterp \
 	--enable-pythoninterp \
 	--enable-rubyinterp \
@@ -953,6 +966,7 @@ build gvim.heavy \
 	--enable-gtk2-check \
 	--enable-gnome-check \
 	--with-x \
+	--enable-luainterp \
 	--enable-perlinterp \
 	--enable-pythoninterp \
 	--enable-rubyinterp \
@@ -973,6 +987,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
@@ -1021,22 +1038,21 @@ ln -sf vi  $RPM_BUILD_ROOT/bin/ex
 ln -sf vi  $RPM_BUILD_ROOT/bin/view
 ln -sf vi  $RPM_BUILD_ROOT/bin/rview
 
-cp -p %{SOURCE14}	$RPM_BUILD_ROOT%{_desktopdir}
-
 %if %{with athena}
-install -p src/bin/gvim.athena	$RPM_BUILD_ROOT%{_bindir}/gvim.athena
-cp -p %{SOURCE10}	$RPM_BUILD_ROOT%{_desktopdir}
+install -p src/bin/gvim.athena $RPM_BUILD_ROOT%{_bindir}/gvim.athena
+cp -p gvim-athena.desktop $RPM_BUILD_ROOT%{_desktopdir}
 %endif
 %if %{with motif}
-install -p src/bin/gvim.motif	$RPM_BUILD_ROOT%{_bindir}/gvim.motif
-cp -p %{SOURCE11}	$RPM_BUILD_ROOT%{_desktopdir}
+install -p src/bin/gvim.motif $RPM_BUILD_ROOT%{_bindir}/gvim.motif
+cp -p gvim-motif.desktop $RPM_BUILD_ROOT%{_desktopdir}
 %endif
 %if %{with gnome}
-install -p src/bin/gvim.gnome	$RPM_BUILD_ROOT%{_bindir}/gvim.gnome
-cp -p %{SOURCE13}	$RPM_BUILD_ROOT%{_desktopdir}
+install -p src/bin/gvim.gnome $RPM_BUILD_ROOT%{_bindir}/gvim.gnome
+cp -p gvim-gnome.desktop $RPM_BUILD_ROOT%{_desktopdir}
 %endif
 %if %{with gtk}
 install -p src/bin/gvim.gtk	$RPM_BUILD_ROOT%{_bindir}/gvim.gtk
+cp -p gvim-gtk.desktop $RPM_BUILD_ROOT%{_desktopdir}
 ln -sf gvim.gtk		$RPM_BUILD_ROOT%{_bindir}/gvim
 ln -sf gvim		$RPM_BUILD_ROOT%{_bindir}/eview
 ln -sf gvim		$RPM_BUILD_ROOT%{_bindir}/evim
@@ -1044,7 +1060,6 @@ ln -sf gvim		$RPM_BUILD_ROOT%{_bindir}/gview
 ln -sf gvim		$RPM_BUILD_ROOT%{_bindir}/gvimdiff
 ln -sf gvim		$RPM_BUILD_ROOT%{_bindir}/rgview
 ln -sf gvim		$RPM_BUILD_ROOT%{_bindir}/rgvim
-cp -p %{SOURCE12}	$RPM_BUILD_ROOT%{_desktopdir}
 %endif
 %if %{with heavy}
 install -p src/bin/vim.heavy	$RPM_BUILD_ROOT%{_bindir}
@@ -1134,7 +1149,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ru) %{_mandir}/ru/man1/rvim.1*
 %lang(ru) %{_mandir}/ru/man1/vim.1*
 %lang(ru) %{_mandir}/ru/man1/vimdiff.1*
-%{_desktopdir}/%{name}.desktop
+%{_desktopdir}/vim.desktop
 
 %if %{with static}
 %files static
@@ -1194,6 +1209,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %dir %{_datadir}/vim
 %dir %{_datadir}/vim/doc
+%verify(not md5 mtime size) %{_datadir}/vim/doc/tags
+%lang(pl) %verify(not md5 mtime size) %{_datadir}/vim/doc/tags-pl
+%verify(not md5 mtime size) %{_datadir}/vim/vimfiles/doc/tags
 
 %dir %{_datadir}/vim/vimfiles
 %dir %{_datadir}/vim/vimfiles/doc
@@ -1212,11 +1230,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/vim/vimfiles/plugin
 %dir %{_datadir}/vim/vimfiles/spell
 %dir %{_datadir}/vim/vimfiles/syntax
-%verify(not md5 mtime size) %{_datadir}/vim/vimfiles/doc/tags
 
 %{_datadir}/vim/*.vim
 
 %dir %{_datadir}/vim/autoload
+%{_datadir}/vim/autoload/*complete.vim
 %doc %{_datadir}/vim/autoload/README.txt
 
 %dir %{_datadir}/vim/ftdetect
@@ -1312,6 +1330,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_datadir}/vim/plugin/*.vim
 %{_datadir}/vim/autoload/*.vim
+%exclude %{_datadir}/vim/autoload/*complete.vim
 %{_datadir}/vim/autoload/xml
 %{_datadir}/vim/compiler
 %{_datadir}/vim/macros
@@ -1326,11 +1345,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 # English
 %{_datadir}/vim/doc/*.txt.gz
-%verify(not md5 mtime size) %{_datadir}/vim/doc/tags
 
 # Polish
 %lang(pl) %{_datadir}/vim/doc/*.plx.gz
-%lang(pl) %verify(not md5 mtime size) %{_datadir}/vim/doc/tags-pl
 
 %files tutor
 %defattr(644,root,root,755)
@@ -1390,10 +1407,13 @@ rm -rf $RPM_BUILD_ROOT
 %lang(sk) %{_datadir}/vim/tutor/tutor.sk
 %lang(sk) %{_datadir}/vim/tutor/tutor.sk.cp1250
 %lang(sk) %{_datadir}/vim/tutor/tutor.sk.utf-8
+%lang(sr) %{_datadir}/vim/tutor/tutor.sr.cp1250
+%lang(sr) %{_datadir}/vim/tutor/tutor.sr.utf-8
 %lang(sv) %{_datadir}/vim/tutor/tutor.sv
 %lang(sv) %{_datadir}/vim/tutor/tutor.sv.utf-8
 %lang(tr) %{_datadir}/vim/tutor/tutor.tr.iso9
 %lang(tr) %{_datadir}/vim/tutor/tutor.tr.utf-8
+%lang(uk) %{_datadir}/vim/tutor/tutor.uk.utf-8
 %lang(vi) %{_datadir}/vim/tutor/tutor.vi.utf-8
 %lang(zh_CN) %{_datadir}/vim/tutor/tutor.zh_cn.utf-8
 %lang(zh_TW) %{_datadir}/vim/tutor/tutor.zh.big5