packages: vim/vim.spec - updated to 7.3 (-extra and -lang merged into main ...

[adamg]

Author: adamg                        Date: Tue Aug 17 10:27:00 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 7.3 (-extra and -lang merged into main tarball)
- -relativenumber.patch merged upstream

---- Files affected:
packages/vim:
   vim.spec (1.518 -> 1.519) 

---- Diffs:

================================================================
Index: packages/vim/vim.spec
diff -u packages/vim/vim.spec:1.518 packages/vim/vim.spec:1.519
--- packages/vim/vim.spec:1.518	Mon Aug 16 14:48:37 2010
+++ packages/vim/vim.spec	Tue Aug 17 12:26:54 2010
@@ -32,8 +32,8 @@
 # Command to check for latest patch:
 # wget -q -O - ftp://ftp.vim.org/pub/editors/vim/patches/7.2/MD5SUMS|grep -vF .gz|tail -n1|awk '{print $2}'
 
-%define		ver		7.2
-%define		patchlevel	444
+%define		ver		7.3
+%define		patchlevel	002
 Summary:	Vi IMproved - a Vi clone
 Summary(de.UTF-8):	VIsual editor iMproved
 Summary(es.UTF-8):	Editor visual incrementado
@@ -51,11 +51,7 @@
 License:	Charityware
 Group:		Applications/Editors/Vim
 Source0:	ftp://ftp.vim.org/pub/vim/unix/%{name}-%{ver}.tar.bz2
-# Source0-md5:	f0901284b338e448bfd79ccca0041254
-Source1:	ftp://ftp.vim.org/pub/vim/extra/%{name}-%{ver}-lang.tar.gz
-# Source1-md5:	d8884786979e0e520c112faf2e176f05
-Source2:	ftp://ftp.vim.org/pub/vim/extra/%{name}-%{ver}-extra.tar.gz
-# Source2-md5:	35e04482f07c57221c9a751aaa3b8dac
+# Source0-md5:	5b9510a17074e2b37d8bb38ae09edbf2
 Source3:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source3-md5:	bc4d1e115ca506ad7751b9bd2b773a7f
 Source4:	http://skawina.eu.org/mikolaj/usr_doc_pl.zip
@@ -81,7 +77,7 @@
 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/7.2/7.2.%03g 1 %{patchlevel}
+%patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/7.3/7.3.%03g 1 %{patchlevel}
 Patch0:		%{name}-sysconfdir.patch
 Patch1:		%{name}-visual.patch
 Patch2:		%{name}-paths.patch
@@ -112,7 +108,6 @@
 Patch104:	%{name}-home_etc.patch
 Patch105:	%{name}-autopaste.patch
 Patch106:	%{name}-ft-cron.patch
-Patch107:	%{name}-relativenumber.patch
 Patch108:	%{name}-phpscript.patch
 Patch109:	%{name}-pam.patch
 Patch110:	%{name}-ft-bash.patch
@@ -684,7 +679,7 @@
 jak również GUI GTK+2.
 
 %prep
-%setup -q -n %{name}72 -b1 -b2
+%setup -q -n %{name}73
 
 # official patches
 %patchset_patch 1 %{patchlevel}
@@ -724,7 +719,7 @@
 %patch105 -p1
 
 %patch106 -p1
-%patch107 -p0
+
 %patch108 -p1
 %patch109 -p1
 %patch110 -p1
@@ -994,7 +989,9 @@
 # unuseful
 rm -rf $RPM_BUILD_ROOT%{_datadir}/vim/tools
 rm -f $RPM_BUILD_ROOT%{_datadir}/vim/bugreport.vim
+rm -f $RPM_BUILD_ROOT%{_datadir}/vim/spell/check_locales.vim
 rm -f $RPM_BUILD_ROOT%{_datadir}/vim/spell/cleanadd.vim
+rm -f $RPM_BUILD_ROOT%{_datadir}/vim/spell/fixdup.vim
 rm -f $RPM_BUILD_ROOT%{_datadir}/vim/doc/vim2html.pl
 
 %clean
@@ -1268,8 +1265,6 @@
 %dir %{_datadir}/vim/tutor/tutor
 
 %{_datadir}/vim/tutor/README.txt
-%{_datadir}/vim/tutor/README.txt.info
-%{_datadir}/vim/tutor/tutor.info
 %{_datadir}/vim/tutor/tutor.vim
 %{_datadir}/vim/tutor/tutor.utf-8
 %lang(el) %{_datadir}/vim/tutor/README.el.cp737.txt
@@ -1285,6 +1280,7 @@
 %lang(el) %{_datadir}/vim/tutor/tutor.el
 %lang(el) %{_datadir}/vim/tutor/tutor.el.cp737
 %lang(el) %{_datadir}/vim/tutor/tutor.el.utf-8
+%lang(eo) %{_datadir}/vim/tutor/tutor.eo
 %lang(eo) %{_datadir}/vim/tutor/tutor.eo.utf-8
 %lang(es) %{_datadir}/vim/tutor/tutor.es
 %lang(es) %{_datadir}/vim/tutor/tutor.es.utf-8
@@ -1308,6 +1304,8 @@
 %lang(pl) %{_datadir}/vim/tutor/tutor.pl
 %lang(pl) %{_datadir}/vim/tutor/tutor.pl.cp1250
 %lang(pl) %{_datadir}/vim/tutor/tutor.pl.utf-8
+%lang(pt) %{_datadir}/vim/tutor/tutor.pt
+%lang(pt) %{_datadir}/vim/tutor/tutor.pt.utf-8
 %lang(ru) %{_datadir}/vim/tutor/tutor.ru
 %lang(ru) %{_datadir}/vim/tutor/tutor.ru.cp1251
 %lang(ru) %{_datadir}/vim/tutor/tutor.ru.utf-8
@@ -1398,6 +1396,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.519  2010/08/17 10:26:54  adamg
+- updated to 7.3 (-extra and -lang merged into main tarball)
+- -relativenumber.patch merged upstream
+
 Revision 1.518  2010/08/16 12:48:37  baggins
 - rel 5
 - added TODO
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vim/vim.spec?r1=1.518&r2=1.519&f=u