#
# Conditional build:
# _without_static - without static version
-# _without_athena - without Athena Widgets-based gvim
+# _without_athena - without Athena Widgets-based gvim. DOESN'T WORK.
# _without_motif - without Motif-based gvim
# _without_gtk - without gtk+-based gvim support
# _without_gnome - without gnome-based gvim support
# _with_ispell - with spell checking (non-standard feature; disables RIGHTLEFT and FKMAP)
-#
+# _with_perl - with perl interp
+# _with_python - with python interp
+# _with_ruby - with ruby interp
+# _with_tcl - with tcl interp
+
+%define _ver 6.0
+%define _patchlevel 208
Summary: Vi IMproved - a Vi clone
Summary(de): VIsual editor iMproved
+Summary(es): Editor visual incrementado
Summary(fr): editeur VIM : VIsual editor iMproved
Summary(pl): Vi IMproved - klon edytora Vi
+Summary(pt_BR): Editor visual incrementado
Summary(tr): Geliþmiþ bir vi sürümü
Name: vim
-Version: 6.0at
-Release: 3
-Epoch: 3
+Version: 6.0.%{_patchlevel}
+Release: 1
+Epoch: 4
License: Charityware
Group: Applications/Editors/Vim
Group(de): Applikationen/Editors/Vim
Group(pl): Aplikacje/Edytory/Vim
-Source0: ftp://ftp.vim.org/pub/editors/vim/unreleased/unix/%{name}-%{version}.tar.bz2
-Source1: ftp://ftp.vim.org/pub/editors/vim/unreleased/extra/%{name}-%{version}-lang.tar.gz
-#Source2: ftp://ftp.vim.org/pub/editors/vim/unreleased/extra/%{name}-%{version}-extra.tar.gz
-Source3: g%{name}-athena.desktop
-Source4: g%{name}-motif.desktop
-Source5: g%{name}-gtk.desktop
-Source6: g%{name}-gnome.desktop
+Source0: ftp://ftp.vim.org/pub/editors/vim/unix/%{name}-%{_ver}.tar.bz2
+Source1: ftp://ftp.vim.org/pub/editors/vim/extra/%{name}-%{_ver}-lang.tar.gz
+Source2: g%{name}-athena.desktop
+Source3: g%{name}-motif.desktop
+Source4: g%{name}-gtk.desktop
+Source5: g%{name}-gnome.desktop
+#packed from ftp://ftp.vim.org/pub/editors/vim/patches/6.0.*
+Source6: %{name}-patches-%{_ver}.%{_patchlevel}.tar.bz2
Patch0: %{name}-sysconfdir.patch
Patch1: %{name}-visual.patch
Patch2: %{name}-phphighlight.patch
Patch3: %{name}-paths.patch
Patch4: %{name}-ispell.patch
-Patch5: %{name}-pl.patch
URL: http://www.vim.org/
+BuildRequires: autoconf
+BuildRequires: gettext-devel
BuildRequires: gpm-devel
BuildRequires: ncurses-devel
%{!?_without_athena:BuildRequires: Xaw3d-devel}
%{!?_without_gnome:BuildRequires: esound-devel}
%{!?_without_gnome:BuildRequires: gnome-libs-devel}
-%{!?_without_gtk:BuildRequires: gtk+-devel}
+%{!?_without_gtk:BuildRequires: gtk+-devel}
%{!?_without_motif:BuildRequires: motif-devel}
%{!?_without_static:BuildRequires: glibc-static}
%{!?_without_static:BuildRequires: ncurses-static}
+%{?_with_perl:BuildRequires: perl-devel}
+%{?_with_python:BuildRequires: python-devel}
+%{?_with_ruby:BuildRequires: ruby}
+%{?_with_tcl:BuildRequires: tcl-devel}
Requires: %{name}-rt = %{version}
%{?_without_static:Requires: %{name}-static = %{version}}
Obsoletes: vim-enhanced
%description
Text editor similar to Vi. Important improvements: multiple windows,
-multi-level undo, block highliting, and many other.
+multi-level undo, block highliting, folding, and many other.
%description -l de
Der Visual-Editor iMproved ist ein aktualisierter und erweiterter Klon
Block-Markierung und viele weitere Zusatzfunktionen im Vergleich zum
Standard-vi-Programm.
+%description -l es
+El editor Visual Mejorado es una versión actualizada y con nuevas
+características adicionales del mundialmente famoso 'vi' que acompaña
+prácticamente todos los sistemas UN*X. Posibilita trabajar con
+múltiples ventanas, varios niveles de deshacer, bloques enfatizados, y
+otras muchas características del 'vi'.
+
%description -l fr
L'éditeur VIsuel aMélioré est un clone mis à jour et doté de
caractéristiques supplémentaires de l'éditeur « vi » fourni avec
%description -l pl
Edytor tekstu podobny do Vi. Wa¿ne ulepszenia: mo¿liwo¶æ pracy w wielu
-oknach, wielopoziomowa opcja 'cofnij', bloki, pod¶wietlanie sk³adni
-i wiele innych.
+oknach, wielopoziomowa opcja 'cofnij', bloki, pod¶wietlanie sk³adni,
+folding i wiele innych.
+
+%description -l pt_BR
+O editor Vim (Vi Enhanced) é um versão atualizada e com novas
+características do mundialmente famoso 'vi' que acompanha praticamente
+todos os sistemas UN*X. Ele possibilita trabalhar com múltiplas
+janelas, vários níveis de desfazer, blocos enfatizados, e muitas
+outras características do 'vi'.
%description -l tr
Standart vi metin düzenleyicisinin geliþmiþ hali; daha fazla komut,
wyj¶cie. Co wiêcej, mo¿e byæ u¿yty do modyfikowania plików binarnych.
%package static
-Summary: Staticly linked Vim
+Summary: Statically linked Vim
Summary(pl): Statycznie zlinkowany Vim
Group: Applications/Editors/Vim
Group(de): Applikationen/Editors/Vim
Obsoletes: vim-minimal
%description static
-Text editor similar to Vi. This version is build with minimal feature
+Text editor similar to Vi. This version is built with minimal feature
and is installed in /bin as a rescue tool. The installation of this
package is STRONGLY recommended.
%description static -l pl
-Edytor tekstu podobny do Vi. Ta wersja zosta³a skompilowana statycznie
-i posiada minimaln± ilo¶æ dodatków. Jest instalowana w /bin jako
+Edytor tekstu podobny do Vi. Ta wersja zosta³a zlinkowana statycznie i
+posiada minimaln± ilo¶æ dodatków. Jest instalowana w /bin jako
narzêdzie dla administratora. Instalacja tego pakietu jest MOCNO
zalecana, mo¿e on pomóc Ci uratowaæ system w czasie awarii.
%description rt
This package contains macros, documentation, syntax configuration and
-manual pages for vim. If you want to take advantage of vim more
+manual pages for Vim. If you want to take advantage of Vim more
powerful features, you should install this package.
%description rt -l pl
W tym pakiecie znajdziesz dokumentacjê, makra, pliki konfiguracyjne i
-strony podrêcznika dla edytora vim. Je¿eli chcesz korzystaæ z
-zaawansowanych mo¿liwo¶ci vim-a, powiniene¶ zainstalowaæ ten pakiet.
+strony podrêcznika dla edytora Vim. Je¿eli chcesz korzystaæ z
+zaawansowanych mo¿liwo¶ci Vima, powiniene¶ zainstalowaæ ten pakiet.
%package -n gvim-athena
Summary: Vim for X Window built with Athena
%description -n gvim-athena
The classic Unix text editor now also under X Window System! This
-version is build with Athena Widget Set.
+version is built with Athena Widget Set.
%description -n gvim-athena -l pl
Wersja edytora Vim pracuj±ca w ¶rodowisku X Window z wykorzystaniem
%description -n gvim-motif
The classic Unix text editor now also under X Window System! This
-version is build with Motif.
+version is built with Motif.
%description -n gvim-motif -l pl
Wersja edytora Vim pracuj±ca w ¶rodowisku X Window z wykorzystaniem
%description -n gvim-gtk
The classic Unix text editor now also under X Window System! This
-version is build with GTK.
+version is built with GTK.
%description -n gvim-gtk -l pl
-Wersja edytora vim pracuj±ca w ¶rodowisku X Window z wykorzystaniem
+Wersja edytora Vim pracuj±ca w ¶rodowisku X Window z wykorzystaniem
biblioteki GTK.
%package -n gvim-gnome
version is build with GNOME.
%description -n gvim-gnome -l pl
-Wersja edytora vim pracuj±ca w ¶rodowisku X Window z wykorzystaniem
+Wersja edytora Vim pracuj±ca w ¶rodowisku X Window z wykorzystaniem
bibliotek GNOME.
%prep
-%setup -q -b1 -n %{name}%(echo %{version} | sed -e "s#\.##g")
+%setup -q -b1 -a6 -n %{name}%(echo %{_ver} | sed -e "s#\.##g")
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%{?_with_ispell:%patch4 -p1}
-%patch5 -p1
+
+# these patches are to "extra" package which we don't need (nor use)
+rm -f patches/6.0.{027,048,053,064,070,073,093,106,107,115,116,117,119,123,121,122,125,135,161,162,164,165,179,186,188,205,207}
+# apply the rest of official patches
+for f in patches/6.0.* ; do
+ echo "Applying official patch `basename $f` ..."
+ patch -s -p0 < $f
+done
%build
cd src
%configure \
--disable-gui \
--without-x \
- --disable-perlinterp \
- --disable-pythoninterp \
- --disable-tclinterp \
- --disable-rubyinterp \
+ %{!?_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 \
--without-x \
--disable-perlinterp \
--disable-pythoninterp \
+ --disable-rubyinterp \
--disable-tclinterp \
--disable-cscope \
--disable-gpm \
--with-features=huge \
--enable-gui=athena \
--with-x \
- --disable-perlinterp \
- --disable-pythoninterp \
- --disable-tclinterp \
- --disable-rubyinterp \
+ %{!?_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 \
--with-features=huge \
--enable-gui=motif \
--with-x \
- --disable-perlinterp \
- --disable-pythoninterp \
- --disable-tclinterp \
- --disable-rubyinterp \
+ %{!?_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 \
--with-features=huge \
--enable-gui=gtk \
--with-x \
- --disable-perlinterp \
- --disable-pythoninterp \
- --disable-tclinterp \
- --disable-rubyinterp \
+ %{!?_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 \
--enable-fontset \
--with-features=huge \
--enable-gui=gnome \
--with-x \
- --disable-perlinterp \
- --disable-pythoninterp \
- --disable-tclinterp \
- --disable-rubyinterp \
+ %{!?_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 \
--enable-fontset \
$RPM_BUILD_ROOT{%{_prefix}/X11R6/bin,%{_applnkdir}/Development/Editors}
%{__make} install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_bindir}/*
+rm -f $RPM_BUILD_ROOT%{_bindir}/*
%{!?_without_static:install src/vim.ncurses $RPM_BUILD_ROOT%{_bindir}/vim}
%{?_without_static:install src/vim.ncurses $RPM_BUILD_ROOT/bin/vi}
%{!?_without_gtk:ln -sf gvim $RPM_BUILD_ROOT%{_prefix}/X11R6/bin/gview}
%{!?_without_gtk:ln -sf gvim $RPM_BUILD_ROOT%{_prefix}/X11R6/bin/rgview}
-%{!?_without_athena:install %{SOURCE3} $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
-%{!?_without_motif: install %{SOURCE4} $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
-%{!?_without_gtk: install %{SOURCE5} $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
-%{!?_without_gnome: install %{SOURCE6} $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
+%{!?_without_athena:install %{SOURCE2} $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
+%{!?_without_motif: install %{SOURCE3} $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
+%{!?_without_gtk: install %{SOURCE4} $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
+%{!?_without_gnome: install %{SOURCE5} $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
%clean
rm -rf $RPM_BUILD_ROOT
%{_datadir}/vim/v*/keymap
%dir %{_datadir}/vim/v*/lang
%{_datadir}/vim/v*/lang/README*
-%lang(af) %{_datadir}/vim/v*/lang/*af*
-%lang(cs) %{_datadir}/vim/v*/lang/*cs*
-%lang(de) %{_datadir}/vim/v*/lang/*de*
+
+%lang(af) %{_datadir}/vim/v*/lang/af
+%lang(de) %{_datadir}/vim/v*/lang/de
%lang(es) %{_datadir}/vim/v*/lang/es
-%lang(es) %{_datadir}/vim/v*/lang/*es_es*
-%lang(es) %{_datadir}/vim/v*/lang/*spanish*
-%lang(fr) %{_datadir}/vim/v*/lang/*fr*
-%lang(hu) %{_datadir}/vim/v*/lang/*hu*
-%lang(nl) %{_datadir}/vim/v*/lang/*nl*
-%lang(it) %{_datadir}/vim/v*/lang/*it*
-%lang(ja) %{_datadir}/vim/v*/lang/*ja*
-%lang(ko) %{_datadir}/vim/v*/lang/*ko*
-%lang(pl) %{_datadir}/vim/v*/lang/*pl*
-%lang(zh_TW) %{_datadir}/vim/v*/lang/*zh*
+%lang(fr) %{_datadir}/vim/v*/lang/fr
+%lang(it) %{_datadir}/vim/v*/lang/it
+%lang(ja) %{_datadir}/vim/v*/lang/ja*
+%lang(ko) %{_datadir}/vim/v*/lang/ko
+%lang(pl) %{_datadir}/vim/v*/lang/pl
+%lang(sk) %{_datadir}/vim/v*/lang/sk
+#%lang(tr) %{_datadir}/vim/v*/lang/tr
+%lang(uk) %{_datadir}/vim/v*/lang/uk
+%lang(zh_CN) %{_datadir}/vim/v*/lang/zh_CN*
+%lang(zh_TW) %{_datadir}/vim/v*/lang/zh_TW
+
+%lang(af) %{_datadir}/vim/v*/lang/menu_af_af*
+%lang(cs) %{_datadir}/vim/v*/lang/menu_cs_cz*
+%lang(de) %{_datadir}/vim/v*/lang/menu_de_de*
+%lang(es) %{_datadir}/vim/v*/lang/menu_es_es*
+%lang(fr) %{_datadir}/vim/v*/lang/menu_fr_fr*
+%lang(hu) %{_datadir}/vim/v*/lang/menu_hu_hu*
+%lang(it) %{_datadir}/vim/v*/lang/menu_it_it*
+%lang(jp) %{_datadir}/vim/v*/lang/menu_ja_jp*
+%lang(ko) %{_datadir}/vim/v*/lang/menu_ko_kr*
+%lang(nl) %{_datadir}/vim/v*/lang/menu_nl_nl*
+%lang(pl) %{_datadir}/vim/v*/lang/menu_pl_pl*
+%lang(sk) %{_datadir}/vim/v*/lang/menu_sk_sk*
+%lang(zh_CN) %{_datadir}/vim/v*/lang/menu_zh_cn*
+%lang(zh_TW) %{_datadir}/vim/v*/lang/menu_zh_tw*
+
%{_datadir}/vim/v*/macros
%{_datadir}/vim/v*/plugin
%{_datadir}/vim/v*/syntax
%{_datadir}/vim/v*/*.vim
%{_datadir}/vim/v*/*.ps
-%{_mandir}/man1/vim.*
+%{_mandir}/man1/vim*
%{_mandir}/man1/rvim.*
%if %{!?_without_athena:1}%{?_without_athena:0}