X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=vim.spec;h=01fead61b5535e0d2bd61954ed1803e989571823;hb=0eb94c356db77584c48db7d568769a73531104ec;hp=b3d35e4814a0d0b8ed3972811247a579e837c9da;hpb=49f0d874fe926db6993f4a43bf8046a47d80ce4e;p=packages%2Fvim.git

diff --git a/vim.spec b/vim.spec
index b3d35e4..01fead6 100644
--- a/vim.spec
+++ b/vim.spec
@@ -7,6 +7,7 @@
 %bcond_without	gnome		# don't build GNOME-based gvim support
 %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	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
@@ -27,8 +28,8 @@
 # VCS Commits: https://code.google.com/p/vim/source/browse/
 
 %define		ver		7.4
-%define		patchlevel	023
-%define		rel		3
+%define		patchlevel	436
+%define		rel		1
 Summary:	Vi IMproved - a Vi clone
 Summary(de.UTF-8):	VIsual editor iMproved
 Summary(es.UTF-8):	Editor visual incrementado
@@ -97,21 +98,21 @@ Patch21:	%{name}-filetypes.patch
 Patch22:	%{name}-man_installation.patch
 Patch23:	%{name}-vimrc.patch
 Patch24:	%{name}-syntax-exports.patch
-
-Patch102:	%{name}-gtkfilechooser.patch
-Patch104:	%{name}-home_etc.patch
-Patch105:	%{name}-autopaste.patch
-Patch106:	%{name}-ft-cron.patch
-Patch108:	%{name}-phpscript.patch
-Patch109:	%{name}-pam.patch
-Patch110:	%{name}-ft-bash.patch
-Patch112:	%{name}-localedir.patch
-Patch113:	%{name}-locales.patch
-Patch114:	%{name}-rtdir.patch
-Patch115:	%{name}-ft-mib.patch
-Patch116:	%{name}-ft-lib-udevrules.patch
-Patch117:	%{name}-ft-mysql.patch
-Patch118:	%{name}-ft-gyp.patch
+Patch25:	sudoers-include.patch
+Patch26:	%{name}-home_etc.patch
+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
+Patch35:	%{name}-ft-mib.patch
+Patch36:	%{name}-ft-lib-udevrules.patch
+Patch37:	%{name}-ft-mysql.patch
+Patch38:	%{name}-ft-gyp.patch
+Patch39:	%{name}-revert-7.4.165-noundo.patch
 URL:		http://www.vim.org/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf
@@ -129,8 +130,8 @@ BuildRequires:	gtk+2-devel >= 2:2.6.0
 %if %{with selinux} || %{with heavy}
 BuildRequires:	libselinux-devel
 %endif
+%{?with_motif:BuildRequires:	motif-devel}
 BuildRequires:	ncurses-devel
-%{?with_motif:BuildRequires:	openmotif-devel}
 BuildRequires:	pkgconfig
 %if %{with perl} || %{with heavy}
 BuildRequires:	perl-devel
@@ -236,8 +237,8 @@ fleira.
 VIM (Vi IMproved) è una versione aggiornata e perfezionata dell'editor
 vi. Vi è stato il primo editor per UNIX realmente basato su video ed è
 ancora molto diffuso. VIM perfeziona vi aggiungendo nuove funzioni:
-finestre multiple, funzione \"annulla\" multilivello, evidenziazione
-dei blocchi e altro.
+finestre multiple, funzione "annulla" multilivello, evidenziazione dei
+blocchi e altro.
 
 %description -l pl.UTF-8
 Edytor tekstu podobny do Vi. Ważne ulepszenia: możliwość pracy w wielu
@@ -331,10 +332,24 @@ tartalmazza, amelyben benne van a Perl, Python, Ruby és Tcl támogatás.
 Pakiet ten dostarcza w pełni funkcjonalną wersję Vima, czyli
 zawierającą obsługę skryptów w językach Perl, Python, Ruby oraz Tcl.
 
+%package light
+Summary:	Minimal build of Vim
+Summary(pl.UTF-8):	Minimalna wersja vima
+Group:		Applications/Editors/Vim
+Provides:	vi-editor
+Provides:	vi
+Provides:	vim-editor = %{epoch}:%{version}-%{release}
+
+%description light
+This package provides light featured version of Vim.
+
+%description light -l pl.UTF-8
+Pakiet ten dostarcza minimalną wersję Vima.
+
 %package -n vimx
 Summary:	Vi IMproved - a Vi clone
 Summary(pl.UTF-8):	Vi IMproved - klon edytora Vi
-Group:		Applications/Editors/Vim
+Group:		X11/Applications/Editors
 Requires:	%{name}-rt = %{epoch}:%{version}-%{release}
 Provides:	vi-editor
 Provides:	vi
@@ -414,6 +429,7 @@ Requires:	rpm-whiteout >= 1.3
 Requires:	vim-plugin-securemodelines
 Obsoletes:	gvim-bonobo
 Obsoletes:	vim-common
+Obsoletes:	vim-syntax-gitcommit
 Obsoletes:	vim-syntax-upstart
 %if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
@@ -749,26 +765,24 @@ jak również GUI GTK+2.
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-
-# home etc
-%{?with_home_etc:%patch104 -p1}
+%patch25 -p1
+%{?with_home_etc:%patch26 -p1}
 
 # autopaste patch - automatically switch to paste mode
 # when `really fast typing' situation happens
-%patch105 -p1
-
-%patch106 -p1
-
-%patch108 -p1
-%patch109 -p1
-%patch110 -p1
-%patch112 -p1
-%patch113 -p1
-%patch114 -p1
-%patch115 -p1
-%patch116 -p1
-%patch117 -p1
-%patch118 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
 
 cp -p %{SOURCE20} runtime/syntax
 cp -p %{SOURCE22} runtime/syntax
@@ -810,7 +824,7 @@ build() {
 		--with-tlib="ncursesw"
 %endif
 
-	%{__make} distclean
+	%{__make} -j1 distclean
 	# add common options, can override (disable) if needed with args
 	%configure \
 		--%{!?with_perl:dis}%{?with_perl:en}able-perlinterp \
@@ -853,6 +867,20 @@ build vim.static \
 LDFLAGS="%{rpmldflags}"
 %endif
 
+%if %{with light}
+build vim.light \
+	--disable-gui \
+	--without-x \
+	--with-features=small \
+	--disable-perlinterp \
+	--disable-pythoninterp \
+	--disable-rubyinterp \
+	--disable-tclinterp \
+	--disable-cscope \
+	--disable-gpm \
+	--disable-nls
+%endif
+
 build vim.ncurses \
 	--disable-gui \
 	--without-x \
@@ -1022,6 +1050,9 @@ cp -p %{SOURCE12}	$RPM_BUILD_ROOT%{_desktopdir}
 install -p src/bin/vim.heavy	$RPM_BUILD_ROOT%{_bindir}
 install -p src/bin/gvim.heavy	$RPM_BUILD_ROOT%{_bindir}
 %endif
+%if %{with light}
+install -p src/bin/vim.light	$RPM_BUILD_ROOT%{_bindir}
+%endif
 
 install -d $RPM_BUILD_ROOT%{_pixmapsdir}
 cp -p runtime/vim48x48.png $RPM_BUILD_ROOT%{_pixmapsdir}/vim.png
@@ -1162,6 +1193,10 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vim/gvimrc
 
 %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
@@ -1180,7 +1215,6 @@ 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
 
@@ -1292,15 +1326,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files doc
 %defattr(644,root,root,755)
-%dir %{_datadir}/vim/doc
-
 # 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)
@@ -1388,6 +1418,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/vim.heavy
 %endif
 
+%if %{with light}
+%files light
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/vim.light
+%endif
+
 %files spell-en
 %defattr(644,root,root,755)
 %{_datadir}/vim/spell/en.*.*