#
# 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(tr): Geliþmiþ bir vi sürümü
Summary(uk): Visual editor IMproved - ´ÄÉÎÏ ÷¦ÒÎÉÊ òÅÄÁËÔÏÒ :)
Name: vim
-Version: 6.1
-Release: 2
+Version: %{_ver}.%{_patchlevel}
+Release: 4
Epoch: 4
License: Charityware
Group: Applications/Editors/Vim
-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.bz2
-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
+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: 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}-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
+Patch9: %{name}-ocaml.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}
Group: Applications/Editors/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
ÐÏ×ΦÓÔÀ ÇÒÁƦÞÎÉÍ ¦ÎÔÅÒÆÅÊÓÏÍ ÔÁ ЦÄÔÒÉÍËÏÀ ÍÉÛ¦.
%prep
-%setup -q -b1 -n %{name}%(echo %{version} | sed -e "s#\.##g")
-## %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
-%{?_with_ispell:%patch3 -p1}
+%patch3 -p1
%ifarch alpha
-%{?_with_ispell:%patch4 -p1}
+%patch4 -p1
%endif
%patch5 -p1
-
-## # these patches are to "extra" package which we don't need (nor use)
-## rm -f patches/6.0.{ , }
-## # apply the rest of official patches
-## for f in patches/6.0.* ; do
-## echo "Applying official patch `basename $f` ..."
-## patch -s -p0 < $f
-## done
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -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 \
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}/*
%{?_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}/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 %{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
%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*
%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}
%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
projects / packages / vim.git / blobdiff