]> git.pld-linux.org Git - packages/vim.git/blobdiff - vim.spec
- updated to 6.0aq.
[packages/vim.git] / vim.spec
index 087a22d08cefacd117c5437d36be74792e15ceed..2ec40994076c19cc99dcb6ad84a2405946cf59ec 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -12,37 +12,38 @@ 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.0ai
+Version:       6.0aq
 Release:       1
 Epoch:         2
 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}-src.tar.gz
-Source1:       ftp://ftp.vim.org/pub/editors/vim/unreleased/unix/%{name}-%{version}-rt.tar.gz
-Source2:       ftp://ftp.vim.org/pub/editors/vim/unreleased/extra/%{name}-%{version}-extra.tar.gz
-Source3:       ftp://ftp.vim.org/pub/editors/vim/unreleased/extra/%{name}-%{version}-lang.tar.gz
-Source4:       g%{name}-athena.desktop
-Source5:       g%{name}-motif.desktop
-Source6:       g%{name}-gtk.desktop
-Source7:       g%{name}-gnome.desktop
+Source0:       ftp://ftp.vim.org/pub/editors/vim/unreleased/unix/%{name}-%{version}-src1.tar.gz
+Source1:       ftp://ftp.vim.org/pub/editors/vim/unreleased/unix/%{name}-%{version}-src2.tar.gz
+Source2:       ftp://ftp.vim.org/pub/editors/vim/unreleased/unix/%{name}-%{version}-rt1.tar.gz
+Source3:       ftp://ftp.vim.org/pub/editors/vim/unreleased/unix/%{name}-%{version}-rt2.tar.gz
+Source4:       ftp://ftp.vim.org/pub/editors/vim/unreleased/extra/%{name}-%{version}-extra.tar.gz
+Source5:       ftp://ftp.vim.org/pub/editors/vim/unreleased/extra/%{name}-%{version}-lang.tar.gz
+Source6:       g%{name}-athena.desktop
+Source7:       g%{name}-motif.desktop
+Source8:       g%{name}-gtk.desktop
+Source9:       g%{name}-gnome.desktop
 Patch0:                %{name}-sysconfdir.patch
 Patch1:                %{name}-visual.patch
-Patch2:                %{name}-lilo.patch
-Patch3:                %{name}-phphighlight.patch
-Patch4:                %{name}-paths.patch
-#Patch5:               %{name}-speed_t.patch
+Patch2:                %{name}-phphighlight.patch
+Patch3:                %{name}-paths.patch
+#Patch4:               %{name}-speed_t.patch
 URL:           http://www.vim.org/
-BuildRequires: ncurses-devel
-%{!?_without_static:BuildRequires:     ncurses-static}
-%{!?_without_static:BuildRequires:     glibc-static}
 BuildRequires: gpm-devel
+BuildRequires: ncurses-devel
 %{!?_without_athena:BuildRequires:     Xaw3d-devel}
-%{!?_without_motif:BuildRequires:      motif-devel}
-%{!?_without_gtk:BuildRequires:        gtk+-devel}
-%{!?_without_gnome:BuildRequires:      gnome-libs-devel}
 %{!?_without_gnome:BuildRequires:      esound-devel}
+%{!?_without_gnome:BuildRequires:      gnome-libs-devel}
+%{!?_without_gtk:BuildRequires:        gtk+-devel}
+%{!?_without_motif:BuildRequires:      motif-devel}
+%{!?_without_static:BuildRequires:     glibc-static}
+%{!?_without_static:BuildRequires:     ncurses-static}
 Requires:      %{name}-rt = %{version}
 %{?_without_static:Requires:   %{name}-static = %{version}}
 Obsoletes:     vim-enhanced
@@ -75,6 +76,27 @@ i wiele innych.
 Standart vi metin düzenleyicisinin geliþmiþ hali; daha fazla komut,
 birden fazla pencere desteði ve blok iþaretleme yetenekleri içerir.
 
+%package -n xxd
+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(de):     Applikationen/Editors/Vim
+Group(pl):     Aplikacje/Edytory/Vim
+
+%description -n xxd
+xxd creates a hex dump of a given file or standard input. It can also
+convert a hex dump back to its original binary form. Like uuencode and
+uudecode it allows the transmission of binary data in a `mail-safe'
+ASCII representation, but has the advantage of decoding to standard
+output. Moreover, it can be used to perform binary file patching.
+
+%description -n xxd -l pl
+xxd tworzy szesnastkowy zapis pliku podanego na standardowe wej¶cie.
+Mo¿e tak¿e przekonwertowaæ taki zapis na oryginaln±, binarn± postaæ.
+Podobnie jak uuencode i uudecode pozwala na przesy³anie danych
+binarnych w postaci ASCII, ale ma mo¿liwo¶æ dekodowania na standardowe
+wyj¶cie. Co wiêcej, mo¿e byæ u¿yty do modyfikowania plików binarnych.
+
 %package static
 Summary:       Staticly linked Vim
 Summary(pl):   Statycznie zlinkowany Vim
@@ -84,7 +106,7 @@ Group(pl):   Aplikacje/Edytory/Vim
 Provides:      vi
 Obsoletes:     vi
 Obsoletes:     vim-minimal
+
 %description static
 Text editor similar to Vi. This version is build with minimal feature
 and is installed in /bin as a rescue tool. The installation of this
@@ -96,13 +118,14 @@ i posiada minimaln
 narzêdzie dla administratora. Instalacja tego pakietu jest MOCNO
 zalecana, mo¿e on pomóc Ci uratowaæ system w czasie awarii.
 
-%package rt 
+%package rt
 Summary:       Vim runtime files
-Summary(pl):   Pliki przydatne edytorowi Vim 
+Summary(pl):   Pliki przydatne edytorowi Vim
 Group:         Applications/Editors/Vim
 Group(de):     Applikationen/Editors/Vim
 Group(pl):     Aplikacje/Edytory/Vim
 Requires:      mktemp
+Requires:      which
 Obsoletes:     vim-common
 
 %description rt
@@ -188,16 +211,16 @@ Wersja edytora vim pracuj
 biblioteki GNOME.
 
 %prep
-%setup -q -b 1 -b 2 -b 3 -n %{name}%(echo %{version} | sed -e "s#\.##g")
+%setup -q -b1 -b2 -b3 -b4 -b5 -n %{name}%(echo %{version} | sed -e "s#\.##g")
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-#%patch5 -p1
+#%patch4 -p1
 
 %build
 cd src
+autoconf
 %configure \
        --disable-gui \
        --without-x \
@@ -206,8 +229,8 @@ cd src
        --disable-tclinterp \
        --disable-rubyinterp \
        --enable-cscope \
-       --enable-gmp \
-       --enable-max-features \
+       --enable-gpm \
+       --with-features=huge \
        --enable-multibyte \
        --with-tlib=ncurses \
        --enable-nls
@@ -215,8 +238,11 @@ cd src
 %{__make} vim
 mv -f vim vim.ncurses
 
+%{__make} xxd/xxd
+
 %if %{!?_without_static:1}%{?_without_static:0}
 %{__make} distclean
+LDFLAGS="%{rpmldflags} -static"
 %configure \
        --disable-gui \
        --without-x \
@@ -226,7 +252,7 @@ mv -f vim vim.ncurses
        --disable-cscope \
        --disable-gpm \
        --disable-multibyte \
-       --enable-min-features \
+       --with-features=small \
        --with-tlib=tinfo \
        --disable-nls
 
@@ -234,13 +260,11 @@ mv -f vim vim.ncurses
 mv -f vim vim.static
 %endif
 
-%{__make} xxd/xxd
-mv -f xxd/xxd xxd.static
-
 %if %{!?_without_athena:1}%{?_without_athena:0}
 %{__make} distclean
+LDFLAGS="%{rpmldflags}"
 %configure \
-       --enable-max-features \
+       --with-features=huge \
        --enable-gui=athena \
        --with-x \
        --disable-perlinterp \
@@ -259,7 +283,7 @@ mv -f vim gvim.athena
 %if %{!?_without_motif:1}%{?_without_motif:0}
 %{__make} distclean
 %configure \
-       --enable-max-features \
+       --with-features=huge \
        --enable-gui=motif \
        --with-x \
        --disable-perlinterp \
@@ -279,7 +303,7 @@ mv -f vim gvim.motif
 %if %{!?_without_gtk:1}%{?_without_gtk:0}
 %{__make} distclean
 %configure \
-       --enable-max-features \
+       --with-features=huge \
        --enable-gui=gtk \
        --with-x \
        --disable-perlinterp \
@@ -297,7 +321,7 @@ mv -f vim gvim.gtk
 %if %{!?_without_gnome:1}%{?_without_gnome:0}
 %{__make} distclean
 %configure \
-       --enable-max-features \
+       --with-features=huge \
        --enable-gui=gnome \
        --with-x \
        --disable-perlinterp \
@@ -314,7 +338,7 @@ mv -f vim gvim.gnome
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_var}/lib/vim,%{_sysconfdir}/vim,%{_bindir}} \
+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}
 
@@ -325,7 +349,7 @@ rm $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/xxd.static                         $RPM_BUILD_ROOT/bin/xxd
+install src/xxd/xxd                            $RPM_BUILD_ROOT%{_bindir}/xxd
 install src/vimtutor                           $RPM_BUILD_ROOT%{_bindir}/vimtutor
 
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/*.1
@@ -359,10 +383,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 %{SOURCE4}         $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
-%{!?_without_motif: install %{SOURCE5}         $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
-%{!?_without_gtk:   install %{SOURCE6}         $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
-%{!?_without_gnome: install %{SOURCE7}         $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
+%{!?_without_athena:install %{SOURCE6}         $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
+%{!?_without_motif: install %{SOURCE7}         $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
+%{!?_without_gtk:   install %{SOURCE8}                 $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
+%{!?_without_gnome: install %{SOURCE9}         $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -372,13 +396,17 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/vim
 %attr(755,root,root) %{_bindir}/rvim
 
+%files -n xxd
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/xxd
+%{_mandir}/man1/xxd.1*
+
 %files static
 %defattr(644,root,root,755)
 %attr(755,root,root) /bin/*
 
 %{_mandir}/man1/vi.1*
 %{_mandir}/man1/ex.1*
-%{_mandir}/man1/xxd.1*
 %{_mandir}/man1/view.1*
 %{_mandir}/man1/rview.1*
 
@@ -389,8 +417,6 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/vim/vimrc
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/vim/gvimrc
 
-%dir %{_var}/lib/vim
-
 %dir %{_datadir}/vim
 %dir %{_datadir}/vim/v*
 %{_datadir}/vim/v*/doc
@@ -411,36 +437,45 @@ rm -rf $RPM_BUILD_ROOT
 %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(pl) %{_datadir}/vim/v*/lang/*pl*
 %lang(zh_TW) %{_datadir}/vim/v*/lang/*zh*
 %{_datadir}/vim/v*/macros
 %{_datadir}/vim/v*/plugin
 %{_datadir}/vim/v*/syntax
 %{_datadir}/vim/v*/tutor
+%{_datadir}/vim/v*/colors
 %{_datadir}/vim/v*/*.vim
 
 %{_mandir}/man1/vim.*
 %{_mandir}/man1/rvim.*
 
-%{!?_without_athena:%files -n gvim-athena}
-%{!?_without_athena:%defattr(644,root,root,755)}
-%{!?_without_athena:%attr(755,root,root) %{_prefix}/X11R6/bin/gvim.athena}
-%{!?_without_athena:%{_applnkdir}/Development/Editors/gvim-athena.desktop}
-
-%{!?_without_motif:%files -n gvim-motif}
-%{!?_without_motif:%defattr(644,root,root,755)}
-%{!?_without_motif:%attr(755,root,root) %{_prefix}/X11R6/bin/gvim.motif}
-%{!?_without_motif:%{_applnkdir}/Development/Editors/gvim-motif.desktop}
-
-%{!?_without_gtk:%files -n gvim-gtk}
-%{!?_without_gtk:%defattr(644,root,root,755)}
-%{!?_without_gtk:%attr(755,root,root) %{_prefix}/X11R6/bin/gvim.gtk}
-%{!?_without_gtk:%attr(755,root,root) %{_prefix}/X11R6/bin/rgvim}
-%{!?_without_gtk:%attr(755,root,root) %{_prefix}/X11R6/bin/rgview}
-%{!?_without_gtk:%attr(755,root,root) %verify(not link) %{_prefix}/X11R6/bin/gvim}
-%{!?_without_gtk:%{_applnkdir}/Development/Editors/gvim-gtk.desktop}
-
-%{!?_without_gnome:%files -n gvim-gnome}
-%{!?_without_gnome:%defattr(644,root,root,755)}
-%{!?_without_gnome:%attr(755,root,root) %{_prefix}/X11R6/bin/gvim.gnome}
-%{!?_without_gnome:%{_applnkdir}/Development/Editors/gvim-gnome.desktop}
+%if %{!?_without_athena:1}%{?_without_athena:0}
+%files -n gvim-athena
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_prefix}/X11R6/bin/gvim.athena
+%{_applnkdir}/Development/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
+%endif
+
+%if %{!?_without_gtk:1}%{?_without_gtk:0}
+%files -n gvim-gtk
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_prefix}/X11R6/bin/gvim.gtk
+%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
+%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
+%endif
This page took 0.043886 seconds and 4 git commands to generate.