SPECS (AC-branch): vim.spec - disable perl/python in main pkg (use -heavy) ...

[glen]

Author: glen                         Date: Fri May 30 05:40:10 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- disable perl/python in main pkg (use -heavy)
- adapter, typos merged from HEAD

---- Files affected:
SPECS:
   vim.spec (1.407.2.18 -> 1.407.2.19) 

---- Diffs:

================================================================
Index: SPECS/vim.spec
diff -u SPECS/vim.spec:1.407.2.18 SPECS/vim.spec:1.407.2.19
--- SPECS/vim.spec:1.407.2.18	Fri May 30 07:28:08 2008
+++ SPECS/vim.spec	Fri May 30 07:40:04 2008
@@ -1,15 +1,14 @@
 # $Revision$, $Date$
-#
 # Conditional build:
 %bcond_without	static		# don't build static version
 %bcond_without	athena		# don't build Athena Widgets-based gvim
 %bcond_without	motif		# don't build Motif-based gvim
 %bcond_without	gtk		# don't build GTK+-based gvim support
 %bcond_without	gnome		# don't build GNOME-based gvim support
-%bcond_without	heavy		# don't build heavy (full-featured GTK+-based gvim/vim)
-%bcond_without	perl		# without Perl interp
-%bcond_without	python		# without Python interp
-%bcond_with	ruby		# with Ruby interp
+%bcond_without	heavy		# don't build heavy (full-featured GNOME-based gvim/vim)
+%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
 %bcond_with	tcl		# with Tcl interp
 %bcond_without	selinux		# without selinux support
 %bcond_without	home_etc	# without home_etc support
@@ -113,7 +112,7 @@
 BuildRequires:	perl-devel
 %endif
 %if %{with python} || %{with heavy}
-BuildRequires:	python-devel >= 2.5
+BuildRequires:	python-devel
 %endif
 BuildRequires:	rpmbuild(macros) >= 1.426
 %if %{with ruby} || %{with heavy}
@@ -272,7 +271,7 @@
 %package heavy
 Summary:	Full featured build of Vim
 Summary(pl.UTF-8):	W pełni funkcjonalna wersja Vim-a
-Group:		Appplications/Editors/Vim
+Group:		Applications/Editors/Vim
 Requires:	%{name}-rt = %{epoch}:%{version}-%{release}
 Provides:	vi-editor
 Provides:	vi
@@ -286,8 +285,8 @@
 
 %description heavy -l pl.UTF-8
 Pakiet ten dostarcza w pełni funkcjonalną wersję Vim-a, czyli
-zawierającą wsparcie dla skryptowania w językach Perl, Python, Ruby oraz
-Tcl.
+zawierającą wsparcie dla skryptowania w językach Perl, Python, Ruby
+oraz Tcl.
 
 %package static
 Summary:	Statically linked Vim
@@ -537,7 +536,7 @@
 %package -n gvim-heavy
 Summary:	Full featured build of Vim with X-window support
 Summary(pl.UTF-8):	W pełni funkcjonalna wersja Vim-a ze wsparciem dla X-window
-Group:		Appplications/Editors/Vim
+Group:		Applications/Editors/Vim
 Requires(post,postun):	gtk+2
 Requires:	%{name}-rt = %{epoch}:%{version}-%{release}
 Requires:	iconv
@@ -547,12 +546,13 @@
 
 %description -n gvim-heavy
 This package provides full featured version of Vim, which includes
-support for Perl, Python, Ruby and Tcl scripting, as well as GTK+2 GUI.
+support for Perl, Python, Ruby and Tcl scripting, as well as GTK+2
+GUI.
 
 %description heavy -l pl.UTF-8
 Pakiet ten dostarcza w pełni funkcjonalną wersję Vim-a, czyli
-zawierającą wsparcie dla skryptowania w językach Perl, Python, Ruby oraz
-Tcl jak również GUI GTK+2.
+zawierającą wsparcie dla skryptowania w językach Perl, Python, Ruby
+oraz Tcl jak również GUI GTK+2.
 
 %prep
 %setup -q -n %{name}71 -b1 -b2
@@ -588,7 +588,7 @@
 # home etc
 %{?with_home_etc:%patch104 -p1}
 
-# autopaste patch - automatically switch to paste mode 
+# autopaste patch - automatically switch to paste mode
 # when`really fast typing' situation happens
 %patch105 -p1
 
@@ -1128,6 +1128,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.407.2.19  2008-05-30 05:40:04  glen
+- disable perl/python in main pkg (use -heavy)
+- adapter, typos merged from HEAD
+
 Revision 1.407.2.18  2008-05-30 05:28:08  glen
 - more options moved to common function
 
================================================================

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