]> git.pld-linux.org Git - packages/vim.git/blobdiff - vim.spec
This commit was manufactured by cvs2git to create tag 'auto-ac-vim-
[packages/vim.git] / vim.spec
index d739a5f3159d27d59c8a9b90210d285d68a89378..492acda7fa78585d089d8deb92a83ecf0384fda4 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -1,7 +1,8 @@
 # TODO:
-# - merge with AC-branch
-# - some nice icon
-# - bonobo patches need update
+# - create vim-full (better name, anybody?) or/and other packages
+#   for scripting languages support
+# - warning: Installed (but unpackaged) file(s) found:
+#   /usr/bin/gview
 #
 # Conditional build:
 %bcond_without static          # don't build static version
 %bcond_without gtk             # don't build GTK+-based gvim support
 %bcond_without gnome           # don't build GNOME-based gvim support
 %bcond_without perl            # without Perl interp
-%bcond_without python          # with Python interp
-%bcond_without ruby            # with Ruby interp
-%bcond_without tcl             # with Tcl interp
-%bcond_with    bonobo          # with bonobo component (breaks other things)
+%bcond_without python          # without Python interp
+%bcond_with    ruby            # with Ruby interp
+%bcond_with    tcl             # with Tcl interp
 %bcond_without selinux         # without selinux support
 %bcond_without home_etc        # without home_etc support
 #
-%define                _ver            7.1
-%define                _patchlevel     0
-%define                _rel            4
+%define                ver             7.1
+%define                patchlevel      244
 
 # cflags get changed while configuring
 %undefine      configure_cache
@@ -34,16 +33,16 @@ Summary(ru.UTF-8):  Visual editor IMproved - Единственно Правил
 Summary(tr.UTF-8):     Gelişmiş bir vi sürümü
 Summary(uk.UTF-8):     Visual editor IMproved - Єдино Вірний Редактор :)
 Name:          vim
-Version:       %{_ver}.%{_patchlevel}
-Release:       %{_rel}
+Version:       %{ver}.%{patchlevel}
+Release:       1
 Epoch:         4
 License:       Charityware
 Group:         Applications/Editors/Vim
-Source0:       ftp://ftp.vim.org/pub/vim/unix/%{name}-%{_ver}.tar.bz2
+Source0:       ftp://ftp.vim.org/pub/vim/unix/%{name}-%{ver}.tar.bz2
 # Source0-md5: 44c6b4914f38d6f9aa959640b89da329
-Source1:       ftp://ftp.vim.org/pub/vim/extra/%{name}-%{_ver}-lang.tar.gz
+Source1:       ftp://ftp.vim.org/pub/vim/extra/%{name}-%{ver}-lang.tar.gz
 # Source1-md5: 144aa049ba70621acf4247f0459f3ee7
-Source2:       ftp://ftp.vim.org/pub/vim/extra/%{name}-%{_ver}-extra.tar.gz
+Source2:       ftp://ftp.vim.org/pub/vim/extra/%{name}-%{ver}-extra.tar.gz
 # Source2-md5: 605cc7ae31bcc9d7864bb0bb6025f55d
 Source3:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source3-md5: bc4d1e115ca506ad7751b9bd2b773a7f
@@ -56,11 +55,9 @@ Source13:    g%{name}-gnome.desktop
 Source14:      %{name}.desktop
 # http://www.vim.org/scripts/script.php?script_id=415 (1.15)
 Source15:      zenburn.%{name}
-Source16:      spec.%{name}
 # http://www.vim.org/scripts/script.php?script_id=1491 (0.7.3)
 Source17:      javascript.%{name}
 Source18:      nagios.%{name}
-Source19:      %{name}-ftplugin-spec.vim
 Patch0:                %{name}-sysconfdir.patch
 Patch1:                %{name}-visual.patch
 Patch2:                %{name}-paths.patch
@@ -85,15 +82,14 @@ Patch20:    %{name}-tutor-lessdeps.patch
 Patch21:       %{name}-nagios.patch
 Patch22:       %{name}-filetypes.patch
 Patch23:       %{name}-man_installation.patch
-Patch100:      %{name}-bonobo-20050909.patch
-Patch101:      %{name}-bonobo.patch
 Patch102:      %{name}-gtkfilechooser.patch
-Patch103:      %{name}-gtkfilechooser-bonobo.patch
 Patch104:      %{name}-home_etc.patch
 Patch105:      %{name}-selinux.patch
 Patch106:      %{name}-autopaste.patch
 Patch107:      %{name}-ft-cron.patch
+%patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/7.1/7.1.%03g 1 %{patchlevel}
 URL:           http://www.vim.org/
+%{?with_athena:BuildRequires:  XFree86-devel}
 BuildRequires: acl-devel
 BuildRequires: autoconf
 BuildRequires: gettext-devel
@@ -105,17 +101,10 @@ BuildRequires:    ncurses-devel
 %{?with_motif:BuildRequires:   openmotif-devel}
 %{?with_perl:BuildRequires:    perl-devel}
 %{?with_python:BuildRequires:  python-devel >= 2.5}
+BuildRequires: rpmbuild(macros) >= 1.426
 %{?with_ruby:BuildRequires:    ruby-devel}
 %{?with_tcl:BuildRequires:     tcl-devel}
-%{?with_athena:BuildRequires:  xorg-lib-libXaw-devel}
 Obsoletes:     kvim
-%if %{with bonobo}
-BuildRequires: ORBit2-devel
-BuildRequires: libbonoboui-devel >= 2.2.0
-BuildRequires: libgnomeui-devel >= 2.2.0.1
-BuildRequires: nautilus-devel >= 2.2.0
-%endif
-BuildRequires: rpmbuild(macros) >= 1.311
 %if %{with static}
 BuildRequires: acl-static
 BuildRequires: attr-static
@@ -313,9 +302,12 @@ Summary(sv.UTF-8): De gemensamma filerna som behövs av alla versioner av redige
 Summary(uk.UTF-8):     Файли, потрібні для будь-якої версії редактору vim
 Summary(zh_CN.UTF-8):  任何版本的 VIM 编辑器所需的公用文件。
 Group:         Applications/Editors/Vim
+Requires:      vim-plugin-securemodelines
+Requires:      vim-syntax-spec
 # mktemp is for vimtutor
 Requires:      mktemp
 Requires:      vi-editor
+Obsoletes:     gvim-bonobo
 Obsoletes:     vim-common
 
 %description rt
@@ -505,26 +497,12 @@ GNOME, что позволяет запускать VIM как приложен
 дозволяє запускати VIM як прикладну програму X Window System - з
 повністю графічним інтерфейсом та підтримкою миші.
 
-%package -n gvim-bonobo
-Summary:       Vim for X Window built as bonobo component
-Summary(pl.UTF-8):     Vim dla X Window zbudowany jako element bonobo
-Group:         Applications/Editors/Vim
-Requires:      %{name}-rt = %{epoch}:%{version}-%{release}
-Requires:      iconv
-Provides:      gvim
-Provides:      vi-editor
-Obsoletes:     vim-X11
-
-%description -n gvim-bonobo
-The classic Unix text editor now also under X Window System! This
-version is build as bonobo component.
-
-%description -n gvim-bonobo -l pl.UTF-8
-Wersja edytora Vim pracująca w środowisku X Window, zbudowana jako
-element bonobo.
-
 %prep
 %setup -q -n %{name}71 -b1 -b2
+
+# official patches
+%patchset_patch 1 %{patchlevel}
+
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -550,14 +528,6 @@ element bonobo.
 %patch22 -p1
 %patch23 -p1
 
-# bonobo
-%if %{with bonobo}
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%endif
-
 # home etc
 %{?with_home_etc:%patch104 -p1}
 
@@ -572,10 +542,8 @@ element bonobo.
 
 install %{SOURCE14} runtime/indent
 install %{SOURCE15} runtime/colors
-install %{SOURCE16} runtime/syntax
 install %{SOURCE17} runtime/syntax
 install %{SOURCE18} runtime/syntax
-install %{SOURCE19} runtime/ftplugin/spec.vim
 
 %build
 cd src
@@ -585,33 +553,6 @@ cp -f configure auto
 
 install -d bin
 
-%if %{with bonobo}
-%{__make} distclean
-%configure \
-       --with-features=huge \
-       --enable-gui=gnome2 \
-       --enable-bonobo \
-       --enable-gtk2-check \
-       --enable-gnome-check \
-       --with-x \
-       %{!?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} \
-       --disable-gpm \
-       --enable-cscope \
-       --enable-nls \
-       --with-modifiedby="PLD Linux Distribution" \
-       --with-compiledby="PLD Linux Distribution"
-
-%{__make} vim-component vim-factory Vim_Control.server
-mv vim-component vim-factory Vim_Control.server bin/
-%endif
-
 %if %{with static}
 %{__make} distclean
 LDFLAGS="%{rpmldflags} -static"
@@ -625,7 +566,6 @@ LDFLAGS="%{rpmldflags} -static"
        --disable-cscope \
        --disable-gpm \
        --disable-multibyte \
-       %{?with_bonobo:--disable-bonobo} \
        --with-features=small \
        --with-tlib="ncurses -ltinfo" \
        --disable-nls \
@@ -650,7 +590,6 @@ LDFLAGS="%{rpmldflags}"
        %{?with_ruby:--enable-rubyinterp} \
        %{!?with_tcl:--disable-tclinterp} \
        %{?with_tcl:--enable-tclinterp} \
-       %{?with_bonobo:--disable-bonobo} \
        --enable-cscope \
        --enable-gpm \
        --with-features=huge \
@@ -678,7 +617,6 @@ mv -f vim bin/vim.ncurses
        %{?with_ruby:--enable-rubyinterp} \
        %{!?with_tcl:--disable-tclinterp} \
        %{?with_tcl:--enable-tclinterp} \
-       %{?with_bonobo:--disable-bonobo} \
        --enable-cscope \
        --enable-fontset \
        --disable-gpm \
@@ -707,7 +645,6 @@ mv -f vim bin/gvim.athena
        %{?with_ruby:--enable-rubyinterp} \
        %{!?with_tcl:--disable-tclinterp} \
        %{?with_tcl:--enable-tclinterp} \
-       %{?with_bonobo:--disable-bonobo} \
        --enable-multibyte \
        --enable-cscope \
        --enable-fontset \
@@ -737,7 +674,6 @@ mv -f vim bin/gvim.motif
        %{?with_ruby:--enable-rubyinterp} \
        %{!?with_tcl:--disable-tclinterp} \
        %{?with_tcl:--enable-tclinterp} \
-       %{?with_bonobo:--disable-bonobo} \
        --disable-gpm \
        --enable-cscope \
        --with-tlib="ncurses -ltinfo" \
@@ -754,7 +690,6 @@ mv -f vim bin/gvim.gtk
 %configure \
        --with-features=huge \
        --enable-gui=gnome2 \
-       %{?with_bonobo:--disable-bonobo} \
        --enable-gtk2-check \
        --enable-gnome-check \
        --with-x \
@@ -858,13 +793,6 @@ install runtime/vim16x16.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/16x16/apps/vim.
 install runtime/vim32x32.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/32x32/apps/vim.png
 install runtime/vim48x48.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/48x48/apps/vim.png
 
-# Bonobo
-%if %{with bonobo}
-install -d $RPM_BUILD_ROOT%{_libdir}/bonobo/servers
-install src/bin/Vim_Control.server $RPM_BUILD_ROOT%{_libdir}/bonobo/servers
-install src/bin/vim-{component,factory} $RPM_BUILD_ROOT%{_bindir}
-%endif
-
 bzip2 -dc %{SOURCE3} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
 unzip -qd $RPM_BUILD_ROOT%{_datadir}/vim/v*/doc %{SOURCE4}
@@ -872,6 +800,16 @@ unzip -qd $RPM_BUILD_ROOT%{_datadir}/vim/v*/doc %{SOURCE4}
 install -d $RPM_BUILD_ROOT%{_datadir}/vim/vimfiles/{doc,{after/,}{compiler,ftdetect,ftplugin,indent,plugin,spell,syntax}}
 > $RPM_BUILD_ROOT%{_datadir}/vim/vimfiles/doc/tags
 
+# separate package
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/vim/vim71/{ftplugin,syntax}/spec.vim
+
+# no autodeps
+chmod a-x $RPM_BUILD_ROOT%{_datadir}/vim/vim71/doc/vim2html.pl
+chmod a-x $RPM_BUILD_ROOT%{_datadir}/vim/vim71/tools/shtags.pl
+chmod a-x $RPM_BUILD_ROOT%{_datadir}/vim/vim71/tools/pltags.pl
+chmod a-x $RPM_BUILD_ROOT%{_datadir}/vim/vim71/tools/efm_perl.pl
+chmod a-x $RPM_BUILD_ROOT%{_datadir}/vim/vim71/tools/efm_filter.pl
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1046,6 +984,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(sk) %{_datadir}/vim/v*/lang/menu_sk*
 %lang(sk) %{_datadir}/vim/v*/lang/menu_*slovak*
 %lang(sk) %{_datadir}/vim/v*/lang/sk/
+%lang(sl) %{_datadir}/vim/v*/lang/menu_sl_si*
 %lang(sr) %{_datadir}/vim/v*/lang/menu_sr*
 %lang(sv) %{_datadir}/vim/v*/lang/menu_sv*
 %lang(sv) %{_datadir}/vim/v*/lang/sv/
@@ -1058,11 +997,13 @@ rm -rf $RPM_BUILD_ROOT
 %lang(zh_CN) %{_datadir}/vim/v*/lang/menu_zh_cn*
 %lang(zh_CN) %{_datadir}/vim/v*/lang/menu_*chinese*gb*
 %lang(zh_CN) %{_datadir}/vim/v*/lang/zh_CN/
+%lang(zh_CN) %{_datadir}/vim/v*/lang/zh_CN.UTF-8/
 %lang(zh_TW) %{_datadir}/vim/v*/lang/menu_zh.cp950*
 %lang(zh_TW) %{_datadir}/vim/v*/lang/menu_zh.big5*
 %lang(zh_TW) %{_datadir}/vim/v*/lang/menu_zh_tw*
 %lang(zh_TW) %{_datadir}/vim/v*/lang/menu_*taiwan*
 %lang(zh_TW) %{_datadir}/vim/v*/lang/zh_TW/
+%lang(zh_TW) %{_datadir}/vim/v*/lang/zh_TW.UTF-8/
 
 %dir %{_datadir}/vim/v*/spell
 %{_datadir}/vim/v*/spell/cleanadd.vim
@@ -1148,11 +1089,3 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gvim.gnome
 %{_desktopdir}/gvim-gnome.desktop
 %endif
-
-%if %{with bonobo}
-%files -n gvim-bonobo
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/vim-component
-%attr(755,root,root) %{_bindir}/vim-factory
-%{_libdir}/bonobo/servers/*
-%endif
This page took 0.078599 seconds and 4 git commands to generate.