- obsolete - fixes already in official patches

[packages/vim.git] / vim.spec

diff --git a/vim.spec b/vim.spec
index c964cefb9aac588c6466365a635fb03ba32c0346..e01150064f15b7e63e7fe0b2aa246cb5f59afdde 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -1,7 +1,7 @@
 #
 # 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
@@ -13,16 +13,16 @@ Summary(fr):        editeur VIM : VIsual editor iMproved
 Summary(pl):   Vi IMproved - klon edytora Vi
 Summary(tr):   Geliþmiþ bir vi sürümü
 Name:          vim
-Version:       6.0at
-Release:       3
-Epoch:         3
+Version:       6.0
+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
+Source0:       ftp://ftp.vim.org/pub/editors/vim/unix/%{name}-%{version}.tar.bz2
+Source1:       ftp://ftp.vim.org/pub/editors/vim/extra/%{name}-%{version}-lang.tar.gz
+#Source2:      ftp://ftp.vim.org/pub/editors/vim/extra/%{name}-%{version}-extra.tar.gz
 Source3:       g%{name}-athena.desktop
 Source4:       g%{name}-motif.desktop
 Source5:       g%{name}-gtk.desktop
@@ -33,7 +33,10 @@ Patch2:              %{name}-phphighlight.patch
 Patch3:                %{name}-paths.patch
 Patch4:                %{name}-ispell.patch
 Patch5:                %{name}-pl.patch
+Patch6:                %{name}-shsyntax.patch
 URL:           http://www.vim.org/
+BuildRequires: autoconf
+BuildRequires: gettext-devel
 BuildRequires: gpm-devel
 BuildRequires: ncurses-devel
 %{!?_without_athena:BuildRequires:     Xaw3d-devel}
@@ -112,7 +115,7 @@ 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
+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.
@@ -129,13 +132,13 @@ Obsoletes:        vim-common
 
 %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
@@ -188,7 +191,7 @@ The classic Unix text editor now also under X Window System! This
 version is build 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
@@ -206,7 +209,7 @@ The classic Unix text editor now also under X Window System! This
 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
@@ -217,6 +220,7 @@ bibliotek GNOME.
 %patch3 -p1
 %{?_with_ispell:%patch4 -p1}
 %patch5 -p1
+%patch6 -p1
 
 %build
 cd src
@@ -385,7 +389,7 @@ ln -sf vi  $RPM_BUILD_ROOT/bin/rview
 
 %{!?_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_gtk:   install %{SOURCE5}         $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
 %{!?_without_gnome: install %{SOURCE6}         $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
 
 %clean
@@ -425,20 +429,36 @@ 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
@@ -448,7 +468,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vim/v*/*.vim
 %{_datadir}/vim/v*/*.ps
 
-%{_mandir}/man1/vim.*
+%{_mandir}/man1/vim*
 %{_mandir}/man1/rvim.*
 
 %if %{!?_without_athena:1}%{?_without_athena:0}