#
# Conditional build:
# _without_static - without static version
-# _without_athena - without Athena Widgets-based gvim. DOESN'T WORK.
+# _without_athena - without Athena Widgets-based gvim
# _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
+%define _ver 6.1
+%define _patchlevel 212
+
Summary: Vi IMproved - a Vi clone
Summary(de): VIsual editor iMproved
Summary(es): Editor visual incrementado
-Summary(fr): editeur VIM : VIsual editor iMproved
+Summary(fr): Editeur VIM : VIsual editor iMproved
Summary(pl): Vi IMproved - klon edytora Vi
Summary(pt_BR): Editor visual incrementado
Summary(ru): Visual editor IMproved - åÄÉÎÓÔ×ÅÎÎÏ ðÒÁ×ÉÌØÎÙÊ òÅÄÁËÔÏÒ :)
Epoch: 4
License: Charityware
Group: Applications/Editors/Vim
-Group(cs): Aplikace/Editory/Vim
-Group(da): Programmer/Tekstbehandlere/Vim
-Group(de): Applikationen/Editoren/Vim
-Group(es): Aplicaciones/Editores/Vim
-Group(fr): Applications/Editeurs/Vim
-Group(is): Forrit/Ritlar/Vim
-Group(it): Applicazioni/Editor/Vim
-Group(ja): ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó/¥¨¥Ç¥£¥¿/Vim
-Group(no): Applikasjoner/Editorer/Vim
-Group(pl): Aplikacje/Edytory/Vim
-Group(pt): Aplicações/Editores/Vim
-Group(ru): ðÒÉÌÏÖÅÎÉÑ/òÅÄÁËÔÏÒÙ/Vim
-Group(sl): Programi/Urejevalniki/Vim
-Group(sv): Tillämpningar/Editorer/Vim
-Group(uk): ðÒÉËÌÁÄΦ ðÒÏÇÒÁÍÉ/òÅÄÁËÔÏÒÉ/Vim
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
-Source7: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
+Source2: ftp://ftp.vim.org/pub/editors/vim/extra/%{name}-%{_ver}-extra.tar.gz
+# packed from ftp://ftp.vim.org/pub/editors/vim/patches/6.1.*
+Source3: %{name}-patches-%{_ver}.%{_patchlevel}.tar.bz2
+Source4: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
+Source10: g%{name}-athena.desktop
+Source11: g%{name}-motif.desktop
+Source12: g%{name}-gtk.desktop
+Source13: g%{name}-gnome.desktop
Patch0: %{name}-sysconfdir.patch
Patch1: %{name}-visual.patch
-Patch2: %{name}-phphighlight.patch
-Patch3: %{name}-paths.patch
-Patch4: %{name}-ispell.patch
-Patch5: %{name}-ispell-axp.patch
+Patch2: %{name}-paths.patch
+Patch3: %{name}-ispell.patch
+Patch4: %{name}-ispell-axp.patch
+Patch5: %{name}-ac25x.patch
+Patch6: %{name}-vimrc.patch
+Patch7: %{name}-no_libelf.patch
+Patch8: %{name}-egrep.patch
URL: http://www.vim.org/
+BuildRequires: acl-devel
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_motif:BuildRequires: motif-devel}
Text editor similar to Vi. Important improvements: multiple windows,
multi-level undo, block highliting, folding, and many other.
+%description -l cs
+ViM je nový a vylep¹ený editor vycházející z klasického editoru vi. Vi
+byl prvním celoobrazovkovým editorem pro Unix a je stále velmi
+populární. ViM je obohacený funkcemi jako: podpora více oken,
+víceúrovòové undo, zvýrazòování blokù a øadu dal¹ích u¾iteèných
+funkcí.
+
%description -l de
Der Visual-Editor iMproved ist ein aktualisierter und erweiterter Klon
des vi-Editors, der mit praktisch allen UN*X-Systemen ausgeliefert
mutltiples, l'annulation a plusieurs niveaux, la mise en évidence des
blocs et autres caractéristiques au vi de base.
+%description -l id
+VIM (VIsual editor iMproved) adalah versi vi editor yang sudah
+diupdate dan ditambah kemampuannya. Vi adalah editor untuk UNIX yang
+pertama yang menggunakan layar, dan sekarang masih sangat populer. VIM
+mengembangkan vi dengan menambah kemampuan baru seperti: multiple
+windows, multi-level undo, block highlighting, dll.
+
+%description -l is
+VIM (VIsual editor iMproved) er uppfærð og endurbætt útgáfa af vi
+ritlinum. Vi var fyrsti skjá-ritillinn fyrir UNIX og er enn mjög
+vinsæll. VIM gerist föðurbetrungur með nýjum möguleikum líkt og
+gluggakerfi, iðrun og yfirbót (e: multi-level undo), blokkarvali og
+fleira.
+
+%description -l it
+VIM (Vi IMproved) è una versione aggiornata e perfezionata dell'editor
+vi. Vi è stato il primo editor per UNIX realmente basato su video ed è
+ancora molto diffuso. VIM perfeziona vi aggiungendo nuove funzioni:
+finestre multiple, funzione \"annulla\" multilivello, evidenziazione
+dei blocchi e altro.
+
%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,
folding i wiele innych.
+%description -l ja
+O VIM (VIsual editor iMproved) é uma versão melhorada e actualizada do
+editor vi. O vi foi o primeiro verdadeiro editor baseado em ecrã para
+o UNIX, e ainda é muito popular. O VIM melhora o vi acrescentando
+novas potencialidades: janelas múltiplas, anulação multi-nível, realce
+de blocos e mais.
+
%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
UN*X-ÓÉÓÔÅÍÁÍÉ. ÷ ÜÔÏÊ ×ÅÒÓÉÉ ÅÓÔØ ÍÎÏÇÏÕÒÏ×ÎÅ×ÙÊ ÏÔËÁÔ, ×ÙÄÅÌÅÎÉÅ
ÂÌÏËÏ×, ÓÉÎÔÁËÓÉÞÅÓËÁÑ ÐÏÄÓ×ÅÔËÁ É ÍÎÏÇÏ ÄÒÕÇÏÇÏ...
+%description -l sk
+VIM (VIsual editor iMproved) je nov¹ia a vylep¹ená verzia editoru vi.
+Vi bol prvým skutoène obrazovkovo orientovaným editorom pre UNIX a
+stále je veµmi populárny. VIM má oproti vi vylep¹enia ako: prácu s
+viacerými oknami, viacnásobné undo, zvýrazòovanie blokov textu a iné.
+
+%description -l sv
+VIM (Vi IMproved) är en uppdaterad och förbättrad version av
+redigeraren vi. Vi var den första riktiga skärmbaserade redigeraren
+till UNIX, och är fortfarande väldigt populär. VIM förbättrar vi med
+nya finesser: flera fönster, flernivå ångra, blockmarkering och mer
+ändå.
+
%description -l tr
Standart vi metin düzenleyicisinin geliþmiþ hali; daha fazla komut,
birden fazla pencere desteði ve blok iþaretleme yetenekleri içerir.
Summary: Utility to convert files to hexdump or do the reverse
Summary(pl): Narzêdzie do zamiany plików na postaæ szesnastkow± i odwrotnie
Group: Applications/Editors/Vim
-Group(cs): Aplikace/Editory/Vim
-Group(da): Programmer/Tekstbehandlere/Vim
-Group(de): Applikationen/Editoren/Vim
-Group(es): Aplicaciones/Editores/Vim
-Group(fr): Applications/Editeurs/Vim
-Group(is): Forrit/Ritlar/Vim
-Group(it): Applicazioni/Editor/Vim
-Group(ja): ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó/¥¨¥Ç¥£¥¿/Vim
-Group(no): Applikasjoner/Editorer/Vim
-Group(pl): Aplikacje/Edytory/Vim
-Group(pt): Aplicações/Editores/Vim
-Group(ru): ðÒÉÌÏÖÅÎÉÑ/òÅÄÁËÔÏÒÙ/Vim
-Group(sl): Programi/Urejevalniki/Vim
-Group(sv): Tillämpningar/Editorer/Vim
-Group(uk): ðÒÉËÌÁÄΦ ðÒÏÇÒÁÍÉ/òÅÄÁËÔÏÒÉ/Vim
%description -n xxd
xxd creates a hex dump of a given file or standard input. It can also
%package static
Summary: Statically linked Vim
-Summary(pl): Statycznie zlinkowany Vim
+Summary(pl): Statycznie skonsolidowany Vim
Group: Applications/Editors/Vim
-Group(cs): Aplikace/Editory/Vim
-Group(da): Programmer/Tekstbehandlere/Vim
-Group(de): Applikationen/Editoren/Vim
-Group(es): Aplicaciones/Editores/Vim
-Group(fr): Applications/Editeurs/Vim
-Group(is): Forrit/Ritlar/Vim
-Group(it): Applicazioni/Editor/Vim
-Group(ja): ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó/¥¨¥Ç¥£¥¿/Vim
-Group(no): Applikasjoner/Editorer/Vim
-Group(pl): Aplikacje/Edytory/Vim
-Group(pt): Aplicações/Editores/Vim
-Group(ru): ðÒÉÌÏÖÅÎÉÑ/òÅÄÁËÔÏÒÙ/Vim
-Group(sl): Programi/Urejevalniki/Vim
-Group(sv): Tillämpningar/Editorer/Vim
-Group(uk): ðÒÉËÌÁÄΦ ðÒÏÇÒÁÍÉ/òÅÄÁËÔÏÒÉ/Vim
Provides: vi
Obsoletes: vi
+Obsoletes: elvis-static
+Obsoletes: nvi
Obsoletes: vim-minimal
%description static
ðÁËÅÔ vim-static ×ÓÔÁÎÏ×ÌÀ¤ Ò¦ÚÎÏ×ÉÄ vim ÑË /bin/vi, ÝÏ ÚÒÕÞÎÏ ÄÌÑ
ÚÁÐÕÓËÕ ÎÁצÔØ ÔÏĦ, ËÏÌÉ ÚÍÏÎÔÏ×ÁÎÁ Ô¦ÌØËÉ ËÏÒÎØÏ×Á ÆÁÊÌÏ×Á ÓÉÓÔÅÍÁ.
+%package ispell
+Summary: Vim with ispell support
+Summary(pl): Vim z wsparciem dla ispella
+Group: Applications/Editors/Vim
+Requires: %{name}-rt = %{version}
+
+%description ispell
+Text editor similar to Vi. This version is built with ispell support.
+
+%description ispell -l pl
+Edytor tekstu podobny do Vi. Ta wersja zosta³a skompilowana ze
+wsparciem dla ispella.
+
%package rt
Summary: Vim runtime files
+Summary(cs): Soubory nezbytné pro libovolný editor ViM
+Summary(da): Fælles filer som er nødvendige for enhver version af VIM editoren
+Summary(de): Die von allen Versionen des VIM-Editors benötigten gemeinsamen Dateien
+Summary(es): Ficheros comunes a todas las versiones de VIM
+Summary(fr): Fichiers communs indispensables pour toute version de l'éditeur VIM
+Summary(id): File umum yang dibutuhkan oleh semua versi editor VIM
+Summary(is): Grunnskrár sem allar útgáfur VIM ritilsins þurfa á að halda
+Summary(it): File comuni necessari per tutte le versioni dell'editor VIM
+Summary(ja): ¤¹¤Ù¤Æ¤Î¥Ð¡¼¥¸¥ç¥ó¤Î VIM ¥¨¥Ç¥£¥¿¤ÇɬÍפȤµ¤ì¤ë¶¦ÄÌ¥Õ¥¡¥¤¥ë
+Summary(no): Felles filer som er nødvendige for enhver versjon av VIM editoren
Summary(pl): Pliki przydatne edytorowi Vim
+Summary(pt): Os ficheiros comuns necessários para qualquer versão do editor VIM
+Summary(ru): æÁÊÌÙ, ÔÒÅÂÕÅÍÙÅ ÄÌÑ ÌÀÂÏÊ ×ÅÒÓÉÉ ÒÅÄÁËÔÏÒÁ vim
+Summary(sk): Spoloèné súbory potrebné pre v¹etky verzie editoru VIM
+Summary(sl): Skupne datoteke, potrebne s katerokoli razlièico urejevalnika VIM
+Summary(sv): De gemensamma filerna som behövs av alla versioner av redigeraren VIM
+Summary(uk): æÁÊÌÉ, ÐÏÔÒ¦ÂΦ ÄÌÑ ÂÕÄØ-ÑËϧ ×ÅÒÓ¦§ ÒÅÄÁËÔÏÒÕ vim
+Summary(zh_CN): Èκΰ汾µÄ VIM ±à¼Æ÷ËùÐèµÄ¹«ÓÃÎļþ¡£
Group: Applications/Editors/Vim
-Group(cs): Aplikace/Editory/Vim
-Group(da): Programmer/Tekstbehandlere/Vim
-Group(de): Applikationen/Editoren/Vim
-Group(es): Aplicaciones/Editores/Vim
-Group(fr): Applications/Editeurs/Vim
-Group(is): Forrit/Ritlar/Vim
-Group(it): Applicazioni/Editor/Vim
-Group(ja): ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó/¥¨¥Ç¥£¥¿/Vim
-Group(no): Applikasjoner/Editorer/Vim
-Group(pl): Aplikacje/Edytory/Vim
-Group(pt): Aplicações/Editores/Vim
-Group(ru): ðÒÉÌÏÖÅÎÉÑ/òÅÄÁËÔÏÒÙ/Vim
-Group(sl): Programi/Urejevalniki/Vim
-Group(sv): Tillämpningar/Editorer/Vim
-Group(uk): ðÒÉËÌÁÄΦ ðÒÏÇÒÁÍÉ/òÅÄÁËÔÏÒÉ/Vim
Requires: mktemp
Requires: which
Obsoletes: vim-common
manual pages for Vim. If you want to take advantage of Vim more
powerful features, you should install this package.
+%description rt -l cs
+Tento balíèek obsahuje spoleèné soubory pro v¹echny dal¹í balíèky s
+vim.
+
+%description rt -l da
+The vim-rt package contains files which every VIM binary will need in
+order to run.
+
+%description rt -l de
+Das Paket vim-rt enthält Dateien, die jede VIM-Binärdatei für die
+Ausführung benötigt.
+
+%description rt -l es
+The vim-rt package contains files which every VIM binary will need in
+order to run.
+
+%description rt -l fr
+Le paquetage vim-rt contient des fichiers dont chaque fichier binaire
+VIM a besoin pour fonctionner.
+
+%description rt -l id
+Package vim-rt berisi file yang dibutuhkan semua versi VIM agar bisa
+berjalan.
+
+%description rt -l is
+vim-rt pakkinn inniheldur skrár sem allar VIM keyrsluskrárnar þurfa
+til að keyra.
+
+%description rt -l it
+Il pacchetto vim-rt contiene i file necessari a ogni binario di VIM
+per poter funzionare.
+
%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 Vima, powiniene¶ zainstalowaæ ten pakiet.
+%description rt -l pt
+O pacote vim-rt contém os ficheiros que todos os executáveis do VIM
+irão necessitar para correr.
+
%description rt -l ru
ðÁËÅÔ vim-rt ÓÏÄÅÒÖÉÔ ÆÁÊÌÙ (ÎÁÐÒÉÍÅÒ, ÆÁÊÌÙ ÓÐÒÁ×ËÉ), ËÏÔÏÒÙÅ ÎÕÖÎÙ
ÄÌÑ ÒÁÂÏÔÙ ÌÀÂÏÊ ÐÒÏÇÒÁÍÍÙ vim.
+%description rt -l sk
+Balík vim-rt obsahuje súbory, ktoré bude potrebova» pre správnu
+funkciu ka¾dá verzia editoru VIM.
+
+%description rt -l sv
+Paketet vim-rt innehåller filer som alla VIM-binärer behöver för att
+köra.
+
%description rt -l uk
ðÁËÅÔ vim-rt ͦÓÔÉÔØ ÆÁÊÌÉ (ÎÁÐÒÉËÌÁÄ, ÆÁÊÌÉ ÄÏצÄËÉ), ËÏÔÒ¦ ÐÏÔÒ¦ÂΦ
ÄÌÑ ÒÏÂÏÔÉ ÂÕÄØ-ÑËϧ ÐÒÏÇÒÁÍÉ vim.
Summary: Vim for X Window built with Athena
Summary(pl): Vim dla X Window korzystaj±cy z biblioteki Athena
Group: Applications/Editors/Vim
-Group(cs): Aplikace/Editory/Vim
-Group(da): Programmer/Tekstbehandlere/Vim
-Group(de): Applikationen/Editoren/Vim
-Group(es): Aplicaciones/Editores/Vim
-Group(fr): Applications/Editeurs/Vim
-Group(is): Forrit/Ritlar/Vim
-Group(it): Applicazioni/Editor/Vim
-Group(ja): ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó/¥¨¥Ç¥£¥¿/Vim
-Group(no): Applikasjoner/Editorer/Vim
-Group(pl): Aplikacje/Edytory/Vim
-Group(pt): Aplicações/Editores/Vim
-Group(ru): ðÒÉÌÏÖÅÎÉÑ/òÅÄÁËÔÏÒÙ/Vim
-Group(sl): Programi/Urejevalniki/Vim
-Group(sv): Tillämpningar/Editorer/Vim
-Group(uk): ðÒÉËÌÁÄΦ ðÒÏÇÒÁÍÉ/òÅÄÁËÔÏÒÉ/Vim
Requires: %{name}-rt = %{version}
Requires: iconv
Obsoletes: vim-X11
Summary: Vim for X Window built with Motif
Summary(pl): Vim dla X Window korzystaj±cy z biblioteki Motif
Group: Applications/Editors/Vim
-Group(cs): Aplikace/Editory/Vim
-Group(da): Programmer/Tekstbehandlere/Vim
-Group(de): Applikationen/Editoren/Vim
-Group(es): Aplicaciones/Editores/Vim
-Group(fr): Applications/Editeurs/Vim
-Group(is): Forrit/Ritlar/Vim
-Group(it): Applicazioni/Editor/Vim
-Group(ja): ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó/¥¨¥Ç¥£¥¿/Vim
-Group(no): Applikasjoner/Editorer/Vim
-Group(pl): Aplikacje/Edytory/Vim
-Group(pt): Aplicações/Editores/Vim
-Group(ru): ðÒÉÌÏÖÅÎÉÑ/òÅÄÁËÔÏÒÙ/Vim
-Group(sl): Programi/Urejevalniki/Vim
-Group(sv): Tillämpningar/Editorer/Vim
-Group(uk): ðÒÉËÌÁÄΦ ðÒÏÇÒÁÍÉ/òÅÄÁËÔÏÒÉ/Vim
Requires: %{name}-rt = %{version}
Requires: iconv
Obsoletes: vim-X11
Summary: Vim for X Window built with gtk
Summary(pl): Vim dla X Window korzystaj±cy z biblioteki GTK
Group: Applications/Editors/Vim
-Group(cs): Aplikace/Editory/Vim
-Group(da): Programmer/Tekstbehandlere/Vim
-Group(de): Applikationen/Editoren/Vim
-Group(es): Aplicaciones/Editores/Vim
-Group(fr): Applications/Editeurs/Vim
-Group(is): Forrit/Ritlar/Vim
-Group(it): Applicazioni/Editor/Vim
-Group(ja): ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó/¥¨¥Ç¥£¥¿/Vim
-Group(no): Applikasjoner/Editorer/Vim
-Group(pl): Aplikacje/Edytory/Vim
-Group(pt): Aplicações/Editores/Vim
-Group(ru): ðÒÉÌÏÖÅÎÉÑ/òÅÄÁËÔÏÒÙ/Vim
-Group(sl): Programi/Urejevalniki/Vim
-Group(sv): Tillämpningar/Editorer/Vim
-Group(uk): ðÒÉËÌÁÄΦ ðÒÏÇÒÁÍÉ/òÅÄÁËÔÏÒÉ/Vim
Requires: %{name}-rt = %{version}
Requires: iconv
Obsoletes: vim-X11
Summary: Vim for X Window built with gnome
Summary(pl): Vim dla X Window korzystaj±cy z biblioteki GNOME
Group: Applications/Editors/Vim
-Group(cs): Aplikace/Editory/Vim
-Group(da): Programmer/Tekstbehandlere/Vim
-Group(de): Applikationen/Editoren/Vim
-Group(es): Aplicaciones/Editores/Vim
-Group(fr): Applications/Editeurs/Vim
-Group(is): Forrit/Ritlar/Vim
-Group(it): Applicazioni/Editor/Vim
-Group(ja): ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó/¥¨¥Ç¥£¥¿/Vim
-Group(no): Applikasjoner/Editorer/Vim
-Group(pl): Aplikacje/Edytory/Vim
-Group(pt): Aplicações/Editores/Vim
-Group(ru): ðÒÉÌÏÖÅÎÉÑ/òÅÄÁËÔÏÒÙ/Vim
-Group(sl): Programi/Urejevalniki/Vim
-Group(sv): Tillämpningar/Editorer/Vim
-Group(uk): ðÒÉËÌÁÄΦ ðÒÏÇÒÁÍÉ/òÅÄÁËÔÏÒÉ/Vim
Requires: %{name}-rt = %{version}
Requires: iconv
Obsoletes: vim-X11
ÐÏ×ΦÓÔÀ ÇÒÁƦÞÎÉÍ ¦ÎÔÅÒÆÅÊÓÏÍ ÔÁ ЦÄÔÒÉÍËÏÀ ÍÉÛ¦.
%prep
-%setup -q -b1 -a6 -n %{name}%(echo %{_ver} | sed -e "s#\.##g")
+## setup -q -b1 -b2 -n %{name}%(echo %{version} | sed -e "s#\.##g")
+%setup -q -b1 -b2 -a3 -n %{name}%(echo %{_ver} | sed -e "s#\.##g")
+
+# skiping patches that are for "extra" package and apply the rest of official patches
+for f in patches/6.1.* ; do
+ echo "Applying official patch `basename $f` ..."
+ patch -s -p0 < $f
+done
+
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%{?_with_ispell:%patch4 -p1}
%ifarch alpha
-%{?_with_ispell:%patch5 -p1}
+%patch4 -p1
%endif
-
-# 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
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
%build
cd src
-autoconf
+%{__autoconf}
+# needed to prevent deconfiguring
+cp -f configure auto
+
+%if %{!?_without_static:1}%{?_without_static:0}
+%{__make} distclean
+LDFLAGS="%{rpmldflags} -static"
+%configure \
+ --disable-gui \
+ --without-x \
+ --disable-perlinterp \
+ --disable-pythoninterp \
+ --disable-rubyinterp \
+ --disable-tclinterp \
+ --disable-cscope \
+ --disable-gpm \
+ --disable-multibyte \
+ --with-features=small \
+ --with-tlib=tinfo \
+ --disable-nls
+
+%{__make} SPELL_OBJ= vim
+mv -f vim vim.static
+LDFLAGS="%{rpmldflags}"
+%endif
+
%configure \
--disable-gui \
--without-x \
--with-tlib=ncurses \
--enable-nls
-%{__make} vim
+%{__make} SPELL_OBJ= vim
mv -f vim vim.ncurses
-
%{__make} xxd/xxd
-%if %{!?_without_static:1}%{?_without_static:0}
%{__make} distclean
-LDFLAGS="%{rpmldflags} -static"
-%configure \
+%configure CFLAGS="%{rpmcflags} -DFEAT_SPELL_HL" \
--disable-gui \
--without-x \
- --disable-perlinterp \
- --disable-pythoninterp \
- --disable-rubyinterp \
- --disable-tclinterp \
- --disable-cscope \
- --disable-gpm \
- --disable-multibyte \
- --with-features=small \
- --with-tlib=tinfo \
- --disable-nls
+ %{!?_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 \
+ --enable-nls
%{__make} vim
-mv -f vim vim.static
-%endif
+mv -f vim vim.ispell
%if %{!?_without_athena:1}%{?_without_athena:0}
%{__make} distclean
-LDFLAGS="%{rpmldflags}"
-%configure \
+%configure CFLAGS="%{rpmcflags} -DFEAT_SPELL_HL" \
--with-features=huge \
--enable-gui=athena \
--with-x \
%if %{!?_without_motif:1}%{?_without_motif:0}
%{__make} distclean
-%configure \
+%configure CFLAGS="%{rpmcflags} -DFEAT_SPELL_HL" \
--with-features=huge \
--enable-gui=motif \
--with-x \
%if %{!?_without_gtk:1}%{?_without_gtk:0}
%{__make} distclean
-%configure \
+%configure CFLAGS="%{rpmcflags} -DFEAT_SPELL_HL" \
--with-features=huge \
--enable-gui=gtk \
--with-x \
%if %{!?_without_gnome:1}%{?_without_gnome:0}
%{__make} distclean
-%configure \
+%configure CFLAGS="%{rpmcflags} -DFEAT_SPELL_HL" \
--with-features=huge \
--enable-gui=gnome \
--with-x \
%{?_without_static:install src/vim.ncurses $RPM_BUILD_ROOT/bin/vi}
%{!?_without_static:install src/vim.static $RPM_BUILD_ROOT/bin/vi}
%{?_without_static:ln -sf /bin/vi $RPM_BUILD_ROOT%{_bindir}/vim}
+install src/vim.ispell $RPM_BUILD_ROOT%{_bindir}/vim.ispell
install src/xxd/xxd $RPM_BUILD_ROOT%{_bindir}/xxd
install src/vimtutor $RPM_BUILD_ROOT%{_bindir}/vimtutor
echo ".so vim.1" > $RPM_BUILD_ROOT%{_mandir}/man1/vi.1
echo ".so vim.1" > $RPM_BUILD_ROOT%{_mandir}/man1/view.1
+
mv -f $RPM_BUILD_ROOT%{_datadir}/vim/v*/vimrc_example.vim $RPM_BUILD_ROOT%{_sysconfdir}/vim/vimrc
mv -f $RPM_BUILD_ROOT%{_datadir}/vim/v*/gvimrc_example.vim $RPM_BUILD_ROOT%{_sysconfdir}/vim/gvimrc
%{!?_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 %{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}
+%{!?_without_athena:install %{SOURCE10} $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
+%{!?_without_motif: install %{SOURCE11} $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
+%{!?_without_gtk: install %{SOURCE12} $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
+%{!?_without_gnome: install %{SOURCE13} $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
-bzip2 -dc %{SOURCE7} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+bzip2 -dc %{SOURCE4} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
%clean
rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/vim
%attr(755,root,root) %{_bindir}/rvim
+%files ispell
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/vim.ispell
+
%files -n xxd
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/xxd
%dir %{_datadir}/vim
%dir %{_datadir}/vim/v*
-%{_datadir}/vim/v*/doc
+%dir %{_datadir}/vim/v*/doc
+%{_datadir}/vim/v*/doc/*.txt
+%verify(not size mtime md5) %{_datadir}/vim/v*/doc/tags
%{_datadir}/vim/v*/ftplugin
%{_datadir}/vim/v*/indent
%{_datadir}/vim/v*/keymap
%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(ja) %{_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*
projects / packages / vim.git / blobdiff