SPECS: vim.spec - update to 7.1.244, spec syntax separated

[glen]

Author: glen                         Date: Sat Feb  9 11:05:03 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update to 7.1.244, spec syntax separated

---- Files affected:
SPECS:
   vim.spec (1.419 -> 1.420) 

---- Diffs:

================================================================
Index: SPECS/vim.spec
diff -u SPECS/vim.spec:1.419 SPECS/vim.spec:1.420
--- SPECS/vim.spec:1.419	Tue Jan 22 14:39:23 2008
+++ SPECS/vim.spec	Sat Feb  9 12:04:58 2008
@@ -18,9 +18,8 @@
 %bcond_without	selinux		# without selinux support
 %bcond_without	home_etc	# without home_etc support
 #
-%define		_ver		7.1
-%define		_patchlevel	236
-%define		_rel		2
+%define		ver		7.1
+%define		patchlevel	244
 
 # cflags get changed while configuring
 %undefine	configure_cache
@@ -35,16 +34,16 @@
 Summary(tr.UTF-8):	Gelişmiş bir vi sürümü
 Summary(uk.UTF-8):	Visual editor IMproved - Єдино Вірний Редактор :)
 Name:		vim
-Version:	%{_ver}.%{_patchlevel}
-Release:	%{_rel}
+Version:	%{ver}.%{patchlevel}
+Release:	2
 Epoch:		4
 License:	Charityware
 Group:		Applications/Editors/Vim
-Source0:	ftp://ftp.vim.org/pub/vim/unix/%{name}-%{_ver}.tar.bz2
+Source0:	ftp://ftp.vim.org/pub/vim/unix/%{name}-%{ver}.tar.bz2
 # Source0-md5:	44c6b4914f38d6f9aa959640b89da329
-Source1:	ftp://ftp.vim.org/pub/vim/extra/%{name}-%{_ver}-lang.tar.gz
+Source1:	ftp://ftp.vim.org/pub/vim/extra/%{name}-%{ver}-lang.tar.gz
 # Source1-md5:	144aa049ba70621acf4247f0459f3ee7
-Source2:	ftp://ftp.vim.org/pub/vim/extra/%{name}-%{_ver}-extra.tar.gz
+Source2:	ftp://ftp.vim.org/pub/vim/extra/%{name}-%{ver}-extra.tar.gz
 # Source2-md5:	605cc7ae31bcc9d7864bb0bb6025f55d
 Source3:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source3-md5:	bc4d1e115ca506ad7751b9bd2b773a7f
@@ -57,11 +56,9 @@
 Source14:	%{name}.desktop
 # http://www.vim.org/scripts/script.php?script_id=415 (1.15)
 Source15:	zenburn.%{name}
-Source16:	spec.%{name}
 # http://www.vim.org/scripts/script.php?script_id=1491 (0.7.3)
 Source17:	javascript.%{name}
 Source18:	nagios.%{name}
-Source19:	%{name}-ftplugin-spec.vim
 Patch0:		%{name}-sysconfdir.patch
 Patch1:		%{name}-visual.patch
 Patch2:		%{name}-paths.patch
@@ -91,7 +88,7 @@
 Patch105:	%{name}-selinux.patch
 Patch106:	%{name}-autopaste.patch
 Patch107:	%{name}-ft-cron.patch
-%patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/7.1/7.1.%03g 1 %{_patchlevel}
+%patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/7.1/7.1.%03g 1 %{patchlevel}
 URL:		http://www.vim.org/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf
@@ -104,7 +101,7 @@
 %{?with_motif:BuildRequires:	openmotif-devel}
 %{?with_perl:BuildRequires:	perl-devel}
 %{?with_python:BuildRequires:	python-devel >= 2.5}
-BuildRequires:	rpmbuild(macros) >= 1.351
+BuildRequires:	rpmbuild(macros) >= 1.426
 %{?with_ruby:BuildRequires:	ruby-devel}
 %{?with_tcl:BuildRequires:	tcl-devel}
 %{?with_athena:BuildRequires:	xorg-lib-libXaw-devel}
@@ -307,6 +304,7 @@
 Summary(zh_CN.UTF-8):	任何版本的 VIM 编辑器所需的公用文件。
 Group:		Applications/Editors/Vim
 Requires:	vim-plugin-securemodelines
+Requires:	vim-syntax-spec
 # mktemp is for vimtutor
 Requires:	mktemp
 Requires:	vi-editor
@@ -504,7 +502,7 @@
 %setup -q -n %{name}71 -b1 -b2
 
 # official patches
-%patchset_patch 1 %{_patchlevel}
+%patchset_patch 1 %{patchlevel}
 
 %patch0 -p1
 %patch1 -p1
@@ -545,10 +543,8 @@
 
 install %{SOURCE14} runtime/indent
 install %{SOURCE15} runtime/colors
-install %{SOURCE16} runtime/syntax
 install %{SOURCE17} runtime/syntax
 install %{SOURCE18} runtime/syntax
-install %{SOURCE19} runtime/ftplugin/spec.vim
 
 %build
 cd src
@@ -805,6 +801,9 @@
 install -d $RPM_BUILD_ROOT%{_datadir}/vim/vimfiles/{doc,{after/,}{compiler,ftdetect,ftplugin,indent,plugin,spell,syntax}}
 > $RPM_BUILD_ROOT%{_datadir}/vim/vimfiles/doc/tags
 
+# separate package
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/vim/vim71/{ftplugin,syntax}/spec.vim
+
 # no autodeps
 chmod a-x $RPM_BUILD_ROOT%{_datadir}/vim/vim71/doc/vim2html.pl
 chmod a-x $RPM_BUILD_ROOT%{_datadir}/vim/vim71/tools/shtags.pl
@@ -1098,6 +1097,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.420  2008-02-09 11:04:58  glen
+- update to 7.1.244, spec syntax separated
+
 Revision 1.419  2008-01-22 13:39:23  glen
 - vim-plugin-securemodelines is -rt dep
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/vim.spec?r1=1.419&r2=1.420&f=u