SPECS: vim.spec - complete kvim dropping - add -extra and -lang back

[glen]

Author: glen                         Date: Thu Mar 30 20:32:54 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- complete kvim dropping
- add -extra and -lang back

---- Files affected:
SPECS:
   vim.spec (1.345 -> 1.346) 

---- Diffs:

================================================================
Index: SPECS/vim.spec
diff -u SPECS/vim.spec:1.345 SPECS/vim.spec:1.346
--- SPECS/vim.spec:1.345	Thu Mar 30 22:23:22 2006
+++ SPECS/vim.spec	Thu Mar 30 22:32:49 2006
@@ -19,7 +19,7 @@
 #
 %define		_ver		7.0
 %define		_patchlevel	c02
-%define		_rel		1.2
+%define		_rel		1.3
 
 # cflags get changed while configuring
 %undefine	configure_cache
@@ -41,16 +41,14 @@
 Group:		Applications/Editors/Vim
 Source0:	ftp://ftp.vim.org/pub/vim/unstable/snapshot/%{name}-%{_ver}%{_patchlevel}.zip
 # Source0-md5:	fea526483d53fffc013a9dddf5c6787c
-#Source1:	ftp://ftp.vim.org/pub/editors/vim/extra/%{name}-%{_ver}-lang.tar.gz
-# Source1-md5:	5395c4dacbf1c5008b22c4b86794e8a7
-#Source2:	ftp://ftp.vim.org/pub/editors/vim/extra/%{name}-%{_ver}-extra.tar.gz
-# Source2-md5:	6e4bd6c8122bcb9dc576514bdb52484e
+Source1:	ftp://ftp.vim.org/pub/vim/unstable/extra/vim-%{_ver}c-lang.tar.gz
+# Source1-md5:	7e05c56768e07149e9158dfa2349e344
+Source2:	ftp://ftp.vim.org/pub/vim/unstable/extra/vim-%{_ver}c-extra.tar.gz
+# Source2-md5:	853d5fb8441382907265122c1d8c148f
 Source4:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source4-md5:	bc4d1e115ca506ad7751b9bd2b773a7f
-Source5:	http://freenux.org/kvim/k%{name}-runtime-6.2.14.tar.bz2
-# Source5-md5:	6f633e79bcf5f35918bb0bff6850a971
-Source6:	http://skawina.eu.org/mikolaj/usr_doc_pl.zip
-# Source6-md5:	ff96284b1c913d55cf0877839b34d490
+Source5:	http://skawina.eu.org/mikolaj/usr_doc_pl.zip
+# Source5-md5:	ff96284b1c913d55cf0877839b34d490
 Source10:	g%{name}-athena.desktop
 Source11:	g%{name}-motif.desktop
 Source12:	g%{name}-gtk.desktop
@@ -431,23 +429,6 @@
 ÄĎÚ×ĎĚѤ ÚÁĐŐÓËÁÔÉ VIM ŃË ĐŇÉËĚÁÄÎŐ ĐŇĎÇŇÁÍŐ X Window System - Ú
 ĐĎ×ÎŚÓÔŔ ÇŇÁĆŚŢÎÉÍ ŚÎÔĹŇĆĹĘÓĎÍ ÔÁ ĐŚÄÔŇÉÍËĎŔ ÍÉŰŚ.
 
-%package -n kvim
-Summary:	Vim for X Window built with KDE
-Summary(pl):	Vim dla X Window korzystający z biblioteki KDE
-Group:		Applications/Editors/Vim
-Requires:	%{name}-rt = %{epoch}:%{version}-%{release}
-Requires:	iconv
-Provides:	vi-editor
-Obsoletes:	vim-X11
-
-%description -n kvim
-The classic Unix text editor now also under X Window System! This
-version is built with KDE.
-
-%description -n kvim -l pl
-Wersja edytora Vim pracująca w środowisku X Window z wykorzystaniem
-biblioteki KDE.
-
 %package -n gvim-gtk
 Summary:	Vim for X Window built with gtk
 Summary(pl):	Vim dla X Window korzystający z biblioteki GTK
@@ -521,7 +502,7 @@
 element bonobo.
 
 %prep
-%setup -q -c -a5
+%setup -q -c
 
 %patch0 -p1
 %{?with_bonobo:%patch99 -p1}
@@ -842,7 +823,7 @@
 %endif
 
 bzip2 -dc %{SOURCE4} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-unzip -d $RPM_BUILD_ROOT%{_datadir}/vim/v*/doc %{SOURCE6}
+unzip -qd $RPM_BUILD_ROOT%{_datadir}/vim/v*/doc %{SOURCE5}
 
 install -d $RPM_BUILD_ROOT%{_datadir}/vim/vimfiles/{doc,{after/,}{compiler,ftdetect,ftplugin,indent,plugin,syntax}}
 > $RPM_BUILD_ROOT%{_datadir}/vim/vimfiles/doc/tags
@@ -1107,6 +1088,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.346  2006/03/30 20:32:49  glen
+- complete kvim dropping
+- add -extra and -lang back
+
 Revision 1.345  2006/03/30 20:23:22  glen
 - add syntax/nagios and ftplugin/spec into main vim-rt paackge
 
@@ -1114,7 +1099,8 @@
 - adapter
 
 Revision 1.343  2006/03/29 21:57:39  arekm
-- updated (ispell dropped - there is builtin spell check; drop kvim; it's no longer maintainer + broken by design)
+- updated (ispell dropped - there is builtin spell check; drop kvim; it's no
+  longer maintainer + broken by design)
 
 Revision 1.342  2006/03/29 21:34:11  arekm
 - package more files
@@ -1124,7 +1110,7 @@
 
 Revision 1.340  2006/03/14 21:31:28  baggins
 - release 2
-- replece javascript syntax with something that highlights
+- replace javascript syntax with something that highlights
 
 Revision 1.279.2.5  2005/09/20 20:58:53  arekm
 - up to .148
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/vim.spec?r1=1.345&r2=1.346&f=u