This commit was manufactured by cvs2git to create branch 'RA-branch'.

[packages/vim.git] / vim.spec

diff --git a/vim.spec b/vim.spec
index 7b93eb09644c51f1387daabf184e02f3201a2127..f28b0bd4602553be92d7cd034aa84deaad63e586 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -11,7 +11,7 @@
 # _with_tcl            - with tcl interp
 
 %define                _ver            6.1
-%define                _patchlevel     063
+%define                _patchlevel     300
 
 Summary:       Vi IMproved - a Vi clone
 Summary(de):   VIsual editor iMproved
@@ -24,7 +24,7 @@ Summary(tr):  Geli
 Summary(uk):   Visual editor IMproved - ´ÄÉÎÏ ÷¦ÒÎÉÊ òÅÄÁËÔÏÒ :)
 Name:          vim
 Version:       %{_ver}.%{_patchlevel}
-Release:       5
+Release:       1
 Epoch:         4
 License:       Charityware
 Group:         Applications/Editors/Vim
@@ -45,9 +45,11 @@ Patch3:              %{name}-ispell.patch
 Patch4:                %{name}-ispell-axp.patch
 Patch5:                %{name}-ac25x.patch
 Patch6:                %{name}-vimrc.patch
-Patch7:                %{name}-libacl_fix.patch
-Patch8:                %{name}-no_libelf.patch
+Patch7:                %{name}-no_libelf.patch
+Patch8:                %{name}-egrep.patch
+Patch9:                %{name}-ocaml.patch
 URL:           http://www.vim.org/
+BuildRequires: acl-devel
 BuildRequires: autoconf
 BuildRequires: gettext-devel
 BuildRequires: gpm-devel
@@ -221,6 +223,8 @@ Summary:    Vim with ispell support
 Summary(pl):   Vim z wsparciem dla ispella
 Group:         Applications/Editors/Vim
 Requires:      %{name}-rt = %{version}
+Conflicts:     ispell < 3.2.06
+Conflicts:     ispell-pl < 20021127-2
 
 %description ispell
 Text editor similar to Vi. This version is built with ispell support.
@@ -442,6 +446,7 @@ done
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 cd src
@@ -610,7 +615,7 @@ mv -f vim gvim.gnome
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/vim,%{_bindir}} \
        $RPM_BUILD_ROOT{/bin,%{_mandir}/man1,%{_datadir}/vim} \
-       $RPM_BUILD_ROOT{%{_prefix}/X11R6/bin,%{_applnkdir}/Development/Editors}
+       $RPM_BUILD_ROOT{%{_prefix}/X11R6/bin,%{_applnkdir}/Editors}
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_bindir}/*
@@ -655,10 +660,10 @@ ln -sf vi  $RPM_BUILD_ROOT/bin/rview
 %{!?_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 %{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}
+%{!?_without_athena:install %{SOURCE10}                $RPM_BUILD_ROOT%{_applnkdir}/Editors}
+%{!?_without_motif: install %{SOURCE11}                $RPM_BUILD_ROOT%{_applnkdir}/Editors}
+%{!?_without_gtk:   install %{SOURCE12}                $RPM_BUILD_ROOT%{_applnkdir}/Editors}
+%{!?_without_gnome: install %{SOURCE13}                $RPM_BUILD_ROOT%{_applnkdir}/Editors}
 
 bzip2 -dc %{SOURCE4} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
@@ -776,14 +781,14 @@ rm -rf $RPM_BUILD_ROOT
 %files -n gvim-athena
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_prefix}/X11R6/bin/gvim.athena
-%{_applnkdir}/Development/Editors/gvim-athena.desktop
+%{_applnkdir}/Editors/gvim-athena.desktop
 %endif
 
 %if %{!?_without_motif:1}%{?_without_motif:0}
 %files -n gvim-motif
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_prefix}/X11R6/bin/gvim.motif
-%{_applnkdir}/Development/Editors/gvim-motif.desktop
+%{_applnkdir}/Editors/gvim-motif.desktop
 %endif
 
 %if %{!?_without_gtk:1}%{?_without_gtk:0}
@@ -793,12 +798,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_prefix}/X11R6/bin/rgvim
 %attr(755,root,root) %{_prefix}/X11R6/bin/rgview
 %attr(755,root,root) %verify(not link) %{_prefix}/X11R6/bin/gvim
-%{_applnkdir}/Development/Editors/gvim-gtk.desktop
+%{_applnkdir}/Editors/gvim-gtk.desktop
 %endif
 
 %if %{!?_without_gnome:1}%{?_without_gnome:0}
 %files -n gvim-gnome
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_prefix}/X11R6/bin/gvim.gnome
-%{_applnkdir}/Development/Editors/gvim-gnome.desktop
+%{_applnkdir}/Editors/gvim-gnome.desktop
 %endif