Author: glen Date: Fri May 30 05:38:53 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merge from AC-branch:
- updated to 7.1.305
- php.vim updated to 0.9.7
- introduces borland.vim and oceandeep.vim color schemes
- renumbered syntax / color schemes files
- vim-heavy / gvim-heavy subpackages (todo done)
- remove dep loop from vim-rt->vim->vim-rt
- vimspell requires vim-rt, not vim
- for applied selinux patch add --disable-selinux
- update bcond description
- fix invalid group
- rel 3
---- Files affected:
SPECS:
vim.spec (1.427 -> 1.428)
---- Diffs:
================================================================
Index: SPECS/vim.spec
diff -u SPECS/vim.spec:1.427 SPECS/vim.spec:1.428
--- SPECS/vim.spec:1.427 Mon Apr 7 10:48:21 2008
+++ SPECS/vim.spec Fri May 30 07:38:47 2008
@@ -1,23 +1,20 @@
# $Revision$, $Date$
-# TODO:
-# - create vim-full (better name, anybody?) or/and other packages
-# for scripting languages support
-#
# 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_with perl # with Perl interp
-%bcond_with python # with 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
#
%define ver 7.1
-%define patchlevel 291
+%define patchlevel 305
# cflags get changed while configuring
%undefine configure_cache
@@ -33,7 +30,7 @@
Summary(uk.UTF-8): Visual editor IMproved - Єдино Вірний Редактор :)
Name: vim
Version: %{ver}.%{patchlevel}
-Release: 2
+Release: 3
Epoch: 4
License: Charityware
Group: Applications/Editors/Vim
@@ -52,15 +49,21 @@
Source12: g%{name}-gtk.desktop
Source13: g%{name}-gnome.desktop
Source14: %{name}.desktop
-# http://www.vim.org/scripts/script.php?script_id=415 (1.15)
-Source15: zenburn.%{name}
+# syntax files
# http://www.vim.org/scripts/script.php?script_id=1491 (0.7.5)
-Source17: javascript.%{name}
-Source18: nagios.%{name}
+Source20: javascript.vim
+Source21: nagios.vim
# http://www.vim.org/scripts/script.php?script_id=447 (20040206)
-Source19: exim.vim
-# http://www.vim.org/scripts/script.php?script_id=1571 (0.9.6)
-Source20: php.vim
+Source22: exim.vim
+# http://www.vim.org/scripts/script.php?script_id=1571 (0.9.7)
+Source23: php.vim
+# color schemes
+# http://www.vim.org/scripts/script.php?script_id=415 (1.15)
+Source30: zenburn.vim
+# http://www.vim.org/scripts/script.php?script_id=92 (1.0)
+Source31: borland.vim
+# http://www.vim.org/scripts/download_script.php?src_id=7799 (1.2.5)
+Source32: oceandeep.vim
Patch0: %{name}-sysconfdir.patch
Patch1: %{name}-visual.patch
Patch2: %{name}-paths.patch
@@ -87,26 +90,37 @@
Patch23: %{name}-man_installation.patch
Patch102: %{name}-gtkfilechooser.patch
Patch104: %{name}-home_etc.patch
-Patch105: %{name}-selinux.patch
-Patch106: %{name}-autopaste.patch
-Patch107: %{name}-ft-cron.patch
+Patch105: %{name}-autopaste.patch
+Patch106: %{name}-ft-cron.patch
%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
BuildRequires: gettext-devel
BuildRequires: gpm-devel
-%{?with_gtk:BuildRequires: gtk+2-devel >= 2:2.6.0}
+%{?with_athena:BuildRequires: xorg-lib-libXaw-devel}
+%if %{with gtk} || %{with heavy}
+BuildRequires: gtk+2-devel >= 2:2.6.0
+%endif
%{?with_gnome:BuildRequires: libgnomeui-devel >= 2.2.0.1}
-%{?with_selinux:BuildRequires: libselinux-devel}
+%if %{with selinux} || %{with heavy}
+BuildRequires: libselinux-devel
+%endif
BuildRequires: ncurses-devel
%{?with_motif:BuildRequires: openmotif-devel}
-%{?with_perl:BuildRequires: perl-devel}
-%{?with_python:BuildRequires: python-devel >= 2.5}
+%if %{with perl} || %{with heavy}
+BuildRequires: perl-devel
+%endif
+%if %{with python} || %{with heavy}
+BuildRequires: python-devel
+%endif
BuildRequires: rpmbuild(macros) >= 1.426
-%{?with_ruby:BuildRequires: ruby-devel}
-%{?with_tcl:BuildRequires: tcl-devel}
-%{?with_athena:BuildRequires: xorg-lib-libXaw-devel}
+%if %{with ruby} || %{with heavy}
+BuildRequires: ruby-devel
+%endif
+%if %{with tcl} || %{with heavy}
+BuildRequires: tcl-devel
+%endif
Obsoletes: kvim
%if %{with static}
BuildRequires: acl-static
@@ -254,6 +268,26 @@
binarnych w postaci ASCII, ale ma możliwość dekodowania na standardowe
wyjście. Co więcej, może być użyty do modyfikowania plików binarnych.
+%package heavy
+Summary: Full featured build of Vim
+Summary(pl.UTF-8): W pełni funkcjonalna wersja Vim-a
+Group: Applications/Editors/Vim
+Requires: %{name}-rt = %{epoch}:%{version}-%{release}
+Provides: vi-editor
+Provides: vi
+Obsoletes: vim-enhanced
+Obsoletes: vim-ispell
+Obsoletes: vim-plugin-multvals
+
+%description heavy
+This package provides full featured version of Vim, which includes
+support for Perl, Python, Ruby and Tcl scripting.
+
+%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.
+
%package static
Summary: Statically linked Vim
Summary(pl.UTF-8): Statycznie skonsolidowany Vim
@@ -311,7 +345,6 @@
Requires: vim-syntax-spec
# mktemp is for vimtutor
Requires: mktemp
-Requires: vi-editor
Obsoletes: gvim-bonobo
Obsoletes: vim-common
@@ -377,7 +410,7 @@
Summary: English dictionaries for VIMspell
Summary(pl.UTF-8): Angielskie słowniki dla VIMspella
Group: Applications/Editors/Vim
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-rt = %{epoch}:%{version}-%{release}
%description spell-en
English dictionaries for VIMspell.
@@ -446,7 +479,6 @@
Summary(pl.UTF-8): Vim dla X Window korzystający z biblioteki GTK
Group: Applications/Editors/Vim
Requires(post,postun): gtk+2
-Requires(post,postun): hicolor-icon-theme
Requires: %{name}-rt = %{epoch}:%{version}-%{release}
Requires: iconv
Provides: gvim
@@ -477,7 +509,6 @@
Summary(pl.UTF-8): Vim dla X Window korzystający z biblioteki GNOME
Group: Applications/Editors/Vim
Requires(post,postun): gtk+2
-Requires(post,postun): hicolor-icon-theme
Requires: %{name}-rt = %{epoch}:%{version}-%{release}
Requires: iconv
Provides: gvim
@@ -502,6 +533,27 @@
дозволяє запускати VIM як прикладну програму X Window System - з
повністю графічним інтерфейсом та підтримкою миші.
+%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: Applications/Editors/Vim
+Requires(post,postun): gtk+2
+Requires: %{name}-rt = %{epoch}:%{version}-%{release}
+Requires: iconv
+Provides: gvim
+Provides: vi-editor
+Obsoletes: vim-X11
+
+%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.
+
+%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.
+
%prep
%setup -q -n %{name}71 -b1 -b2
@@ -536,36 +588,58 @@
# home etc
%{?with_home_etc:%patch104 -p1}
-# selinux
-%{?with_selinux:%patch105 -p1}
+# autopaste patch - automatically switch to paste mode
+# when`really fast typing' situation happens
+%patch105 -p1
-# autopaste patch - automatically switch to paste mode if `really fast typing'
-# situation happens
%patch106 -p1
-%patch107 -p1
-
-install %{SOURCE14} runtime/indent
-install %{SOURCE15} runtime/colors
-install %{SOURCE17} runtime/syntax
-install %{SOURCE18} runtime/syntax
-install %{SOURCE19} runtime/syntax
-install %{SOURCE20} runtime/syntax
+install %{SOURCE20} runtime/syntx
+install %{SOURCE21} runtime/syntax
+install %{SOURCE22} runtime/syntax
+install %{SOURCE23} runtime/syntax
+install %{SOURCE30} runtime/colors
+install %{SOURCE31} runtime/colors
%build
cd src
%{__autoconf}
# needed to prevent deconfiguring
cp -f configure auto
-
install -d bin
+build() {
+ set -x
+ local target=$1
+ shift
+
+ %{__make} distclean
+ # add common options, can override (disable) if needed with args
+ %configure \
+ --%{!?with_perl:dis}%{?with_perl:en}able-perlinterp \
+ --%{!?with_python:dis}%{?with_python:en}able-pythoninterp \
+ --%{!?with_ruby:dis}%{?with_ruby:en}able-rubyinterp \
+ --%{!?with_tcl:dis}%{?with_tcl:en}able-tclinterp \
+ %{!?with_selinux:--disable-selinux} \
+ --enable-cscope \
+ --enable-gpm \
+ --enable-multibyte \
+ --enable-nls \
+ --with-tlib="ncurses -ltinfo" \
+ --with-modifiedby="PLD Linux Distribution" \
+ --with-compiledby="PLD Linux Distribution" \
+ "$@"
+
+ %{__make} vim
+ mv -f vim bin/$target
+}
+
%if %{with static}
-%{__make} distclean
LDFLAGS="%{rpmldflags} -static"
-%configure \
+build vim.static \
--disable-gui \
--without-x \
+ --with-features=small \
--disable-perlinterp \
--disable-pythoninterp \
--disable-rubyinterp \
@@ -573,150 +647,84 @@
--disable-cscope \
--disable-gpm \
--disable-multibyte \
- --with-features=small \
- --with-tlib="ncurses -ltinfo" \
- --disable-nls \
- --with-modifiedby="PLD Linux Distribution" \
- --with-compiledby="PLD Linux Distribution"
-
-%{__make} vim
+ --disable-nls
-mv -f vim bin/vim.static
LDFLAGS="%{rpmldflags}"
%endif
-%{__make} distclean
-%configure \
+build vim.ncurses \
--disable-gui \
--without-x \
- %{!?with_perl:--disable-perlinterp} \
- %{?with_perl:--enable-perlinterp} \
- %{!?with_python:--disable-pythoninterp} \
- %{?with_python:--enable-pythoninterp} \
- %{!?with_ruby:--disable-rubyinterp} \
- %{?with_ruby:--enable-rubyinterp} \
- %{!?with_tcl:--disable-tclinterp} \
- %{?with_tcl:--enable-tclinterp} \
- --enable-cscope \
- --enable-gpm \
- --with-features=huge \
- --enable-multibyte \
- --with-tlib="ncurses -ltinfo" \
- --enable-nls \
- --with-modifiedby="PLD Linux Distribution" \
- --with-compiledby="PLD Linux Distribution"
-
-%{__make} vim
-
-mv -f vim bin/vim.ncurses
+ --with-features=huge
%if %{with athena}
-%{__make} distclean
-%configure \
+build gvim.athena \
--with-features=huge \
--enable-gui=athena \
--with-x \
- %{!?with_perl:--disable-perlinterp} \
- %{?with_perl:--enable-perlinterp} \
- %{!?with_python:--disable-pythoninterp} \
- %{?with_python:--enable-pythoninterp} \
- %{!?with_ruby:--disable-rubyinterp} \
- %{?with_ruby:--enable-rubyinterp} \
- %{!?with_tcl:--disable-tclinterp} \
- %{?with_tcl:--enable-tclinterp} \
- --enable-cscope \
--enable-fontset \
--disable-gpm \
- --without-gnome \
- --with-tlib="ncurses -ltinfo" \
- --enable-nls \
- --with-modifiedby="PLD Linux Distribution" \
- --with-compiledby="PLD Linux Distribution"
+ --without-gnome
-%{__make} vim
-mv -f vim bin/gvim.athena
%endif
-
%if %{with motif}
-%{__make} distclean
-%configure \
+build gvim.motif \
--with-features=huge \
--enable-gui=motif \
--with-x \
- %{!?with_perl:--disable-perlinterp} \
- %{?with_perl:--enable-perlinterp} \
- %{!?with_python:--disable-pythoninterp} \
- %{?with_python:--enable-pythoninterp} \
- %{!?with_ruby:--disable-rubyinterp} \
- %{?with_ruby:--enable-rubyinterp} \
- %{!?with_tcl:--disable-tclinterp} \
- %{?with_tcl:--enable-tclinterp} \
--enable-multibyte \
- --enable-cscope \
--enable-fontset \
--disable-gpm \
- --without-gnome \
- --with-tlib="ncurses -ltinfo" \
- --enable-nls \
- --with-modifiedby="PLD Linux Distribution" \
- --with-compiledby="PLD Linux Distribution"
+ --without-gnome
-%{__make} vim
-mv -f vim bin/gvim.motif
%endif
%if %{with gtk}
-%{__make} distclean
-%configure \
+build gvim.gtk \
--with-features=huge \
--enable-gui=gtk2 \
--enable-gtk2-check \
--with-x \
- %{!?with_perl:--disable-perlinterp} \
- %{?with_perl:--enable-perlinterp} \
- %{!?with_python:--disable-pythoninterp} \
- %{?with_python:--enable-pythoninterp} \
- %{!?with_ruby:--disable-rubyinterp} \
- %{?with_ruby:--enable-rubyinterp} \
- %{!?with_tcl:--disable-tclinterp} \
- %{?with_tcl:--enable-tclinterp} \
- --disable-gpm \
- --enable-cscope \
- --with-tlib="ncurses -ltinfo" \
- --enable-nls \
- --with-modifiedby="PLD Linux Distribution" \
- --with-compiledby="PLD Linux Distribution"
+ --disable-gpm
-%{__make} vim
-mv -f vim bin/gvim.gtk
%endif
%if %{with gnome}
-%{__make} distclean
-%configure \
+build gvim.gnome \
--with-features=huge \
--enable-gui=gnome2 \
--enable-gtk2-check \
--enable-gnome-check \
--with-x \
- %{!?with_perl:--disable-perlinterp} \
- %{?with_perl:--enable-perlinterp} \
- %{!?with_python:--disable-pythoninterp} \
- %{?with_python:--enable-pythoninterp} \
- %{!?with_ruby:--disable-rubyinterp} \
- %{?with_ruby:--enable-rubyinterp} \
- %{!?with_tcl:--disable-tclinterp} \
- %{?with_tcl:--enable-tclinterp} \
- --disable-gpm \
- --enable-cscope \
- --with-tlib="ncurses -ltinfo" \
- --enable-nls \
- --with-modifiedby="PLD Linux Distribution" \
- --with-compiledby="PLD Linux Distribution"
+ --disable-gpm
+
+%endif
+
+# vim.heavy / gvim.heavy
+%if %{with heavy}
+build vim.heavy \
+ --with-features=huge \
+ --disable-gui \
+ --without-x \
+ --enable-perlinterp \
+ --enable-pythoninterp \
+ --enable-rubyinterp \
+ --enable-tclinterp \
+ --disable-gpm
+
+build gvim.heavy \
+ --with-features=huge \
+ --enable-gui=gnome2 \
+ --enable-gtk2-check \
+ --enable-gnome-check \
+ --with-x \
+ --enable-perlinterp \
+ --enable-pythoninterp \
+ --enable-rubyinterp \
+ --enable-tclinterp \
+ --disable-gpm
-%{__make} vim
-mv -f vim bin/gvim.gnome
%endif
%{__make} xxd/xxd languages
@@ -794,6 +802,10 @@
ln -sf gvim $RPM_BUILD_ROOT%{_bindir}/rgvim
install %{SOURCE12} $RPM_BUILD_ROOT%{_desktopdir}
%endif
+%if %{with heavy}
+install src/bin/vim.heavy $RPM_BUILD_ROOT%{_bindir}
+install src/bin/gvim.heavy $RPM_BUILD_ROOT%{_bindir}
+%endif
install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/{16x16,32x32,48x48}/apps
install runtime/vim16x16.png
$RPM_BUILD_ROOT%{_iconsdir}/hicolor/16x16/apps/vim.png
@@ -1047,6 +1059,12 @@
%{_iconsdir}/hicolor/32x32/apps/vim.png
%{_iconsdir}/hicolor/48x48/apps/vim.png
+%if %{with heavy}
+%files heavy
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/vim.heavy
+%endif
+
%files spell-en
%defattr(644,root,root,755)
%{_datadir}/vim/v*/spell/en.*.*
@@ -1098,12 +1116,32 @@
%{_desktopdir}/gvim-gnome.desktop
%endif
+%if %{with heavy}
+%files -n gvim-heavy
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/gvim.heavy
+%endif
+
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[EMAIL PROTECTED]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.428 2008-05-30 05:38:47 glen
+- merge from AC-branch:
+ - updated to 7.1.305
+ - php.vim updated to 0.9.7
+ - introduces borland.vim and oceandeep.vim color schemes
+ - renumbered syntax / color schemes files
+ - vim-heavy / gvim-heavy subpackages (todo done)
+ - remove dep loop from vim-rt->vim->vim-rt
+ - vimspell requires vim-rt, not vim
+ - for applied selinux patch add --disable-selinux
+- update bcond description
+- fix invalid group
+- rel 3
+
Revision 1.427 2008-04-07 08:48:21 glen
- -rt R: hicolor-icon-theme due dirdeps
- update to 7.1.291
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/vim.spec?r1=1.427&r2=1.428&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
