Author: arekm Date: Wed Mar 29 21:57:46 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- updated (ispell dropped - there is builtin spell check; drop kvim; it's no
longer maintainer + broken by design)
---- Files affected:
SPECS:
vim.spec (1.342 -> 1.343)
---- Diffs:
================================================================
Index: SPECS/vim.spec
diff -u SPECS/vim.spec:1.342 SPECS/vim.spec:1.343
--- SPECS/vim.spec:1.342 Wed Mar 29 23:34:11 2006
+++ SPECS/vim.spec Wed Mar 29 23:57:39 2006
@@ -1,7 +1,6 @@
# $Revision$, $Date$
# TODO:
# - some nice icon
-# - fix perl build
# - patches cleanup
#
# Conditional build:
@@ -10,14 +9,12 @@
%bcond_without motif # don't build Motif-based gvim
%bcond_without gtk # don't build GTK+-based gvim support
%bcond_without gnome # don't build GNOME-based gvim support
-%bcond_with kde # build kvim
%bcond_without perl # without Perl interp
%bcond_without python # without Python interp
%bcond_with ruby # with Ruby interp
%bcond_with tcl # with Tcl interp
%bcond_with bonobo # with bonobo component (breaks other things)
%bcond_without selinux # without selinux support
-%bcond_without ispell # don't build vim.ispell
%bcond_without home_etc # without home_etc support
#
%define _ver 7.0
@@ -68,14 +65,11 @@
Patch0: %{name}-sysconfdir.patch
Patch1: %{name}-visual.patch
Patch2: %{name}-paths.patch
-Patch3: %{name}-ispell.patch
-Patch4: %{name}-ispell-axp.patch
Patch5: %{name}-%{name}rc.patch
Patch6: %{name}-no_libelf.patch
Patch7: %{name}-egrep.patch
Patch8: k%{name}-desktop.patch
Patch9: %{name}-awk.patch
-Patch10: %{name}-pl.po.patch
Patch11: %{name}-bonobo.patch
Patch12: %{name}-home_etc.patch
Patch13: %{name}-selinux.patch
@@ -86,12 +80,9 @@
Patch21: %{name}-gtkfilechooser.patch
Patch22: %{name}-gtkfilechooser-bonobo.patch
Patch23: %{name}-doubleparenthesis.patch
-Patch24: %{name}-lib64.patch
Patch25: %{name}-syntax-fstab.patch
Patch26: 010_all_%{name}-6.3-vixie.patch
Patch27: 013_all_%{name}-7.0-cron-vars-79981.patch
-Patch28: 014_all_%{name}-6.3-dns-syntax.patch
-Patch29: 015_all_%{name}-6.3-screen.linux-is-dark-83416.patch
Patch30: 020_all_%{name}-7.0-fstab-tmpfs-size.patch
Patch31: 021_all_%{name}-7.0-fstab-bogus-errors.patch
Patch32: 024_all_%{name}-6.3-bash-83565.patch
@@ -100,7 +91,6 @@
Patch35: %{name}-filetype_vim-php45.patch
Patch36: %{name}-tutor-lessdeps.patch
Patch99: %{name}-bonobo-20050909.patch
-Patch999: http://freenux.org/vim/%{name}2kvim-6.3b.diff.bz2
URL: http://www.vim.org/
%{?with_athena:BuildRequires: xorg-lib-libXaw-devel}
BuildRequires: acl-devel
@@ -108,11 +98,7 @@
BuildRequires: gettext-devel
BuildRequires: gpm-devel
%{?with_gtk:BuildRequires: gtk+2-devel >= 2:2.6.0}
-%if %{with kde}
-BuildRequires: kdelibs-devel >= 9:3.0.0
-%else
Obsoletes: kvim
-%endif
%{?with_gnome:BuildRequires: libgnomeui-devel >= 2.2.0.1}
%{?with_selinux:BuildRequires: libselinux-devel}
BuildRequires: ncurses-devel
@@ -147,6 +133,7 @@
Provides: vi-editor
Provides: vi
Obsoletes: vim-enhanced
+Obsoletes: vim-ispell
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# that's example script
@@ -302,22 +289,6 @@
đÁËĹÔ 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 = %{epoch}:%{version}-%{release}
-Provides: vi-editor
-Conflicts: ispell < 3.2.06
-Conflicts: ispell-pl < 20021127-2
-
-%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
@@ -548,27 +519,17 @@
%prep
%setup -q -c -a5
-# kvim
-#%patch999 -p1
-
%patch0 -p1
%{?with_bonobo:%patch99 -p1}
%patch1 -p1
%patch2 -p1
-#%patch3 -p1
-%ifarch alpha
-%patch4 -p1
-%endif
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch9 -p1
-#%patch10 -p1
%{?with_bonobo:%patch11 -p1}
%{?with_home_etc:%patch12 -p1}
%{?with_selinux:%patch13 -p1}
-#%patch14 -p1
-#%patch15 -p1
%patch16 -p1
#%patch17 -p1
#%patch18 -p1
@@ -576,14 +537,9 @@
#%{!?with_bonobo:%patch21 -p0}
%{?with_bonobo:%patch22 -p1}
%patch23 -p1
-%if "%{_lib}" == "lib64"
-#%patch24 -p1
-%endif
#%patch25 -p1
%patch26 -p0
%patch27 -p1
-#%patch28 -p1
-#%patch29 -p0
%patch30 -p1
%patch31 -p1
%patch32 -p0
@@ -684,64 +640,6 @@
%{__make} vim \
SPELL_OBJ=
mv -f vim bin/vim.ncurses
-%if %{with ispell}
-%{__make} distclean
-%configure \
- CFLAGS="%{rpmcflags} -DFEAT_SPELL_HL" \
- --disable-gui \
- --without-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} \
- %{?with_bonobo:--disable-bonobo} \
- --enable-cscope \
- --enable-gpm \
- --with-features=huge \
- --enable-multibyte \
- --with-tlib=ncurses \
- --enable-nls \
- --with-modifiedby="PLD Linux Distribution" \
- --with-compiledby="PLD Linux Distribution"
-
-%{__make} vim
-mv -f vim bin/vim.ispell
-%endif
-%if %{with kde}
-%{__make} distclean
-%configure \
- CFLAGS="%{rpmcflags} -DFEAT_SPELL_HL" \
- --with-features=huge \
- --enable-gui=kde \
- --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} \
- %{?with_bonobo:--disable-bonobo} \
- --enable-cscope \
- --with-qt-dir=%{_prefix} \
- --with-qt-includes=%{_includedir}/qt \
- --with-qt-libs=%{_libdir} \
- --enable-fontset \
- --disable-gpm \
- --without-gnome \
- --enable-nls \
- --with-modifiedby="PLD Linux Distribution" \
- --enable-kde-toolbar \
- --with-compiledby="PLD Linux Distribution"
-
-%{__make} -j1 vim
-mv -f vim bin/kvim
-%endif
%if %{with athena}
%{__make} distclean
@@ -877,9 +775,6 @@
install src/bin/vim.ncurses $RPM_BUILD_ROOT/bin/vi
ln -sf /bin/vi $RPM_BUILD_ROOT%{_bindir}/vim
%endif
-%if %{with ispell}
-install src/bin/vim.ispell $RPM_BUILD_ROOT%{_bindir}/vim.ispell
-%endif
install src/xxd/xxd $RPM_BUILD_ROOT%{_bindir}/xxd
install src/vimtutor $RPM_BUILD_ROOT%{_bindir}/vimtutor
@@ -932,21 +827,6 @@
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
-%if %{with kde}
-install src/bin/kvim $RPM_BUILD_ROOT%{_bindir}/kvim
-install -d $RPM_BUILD_ROOT%{_desktopdir}/kde
-install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/{16x16,22x22}/actions
-install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/64x64/apps
-install runtime/hi16-action-make.png
$RPM_BUILD_ROOT%{_iconsdir}/hicolor/16x16/actions
-install runtime/hi22-action-make.png
$RPM_BUILD_ROOT%{_iconsdir}/hicolor/22x22/actions
-install runtime/kvim32x32.png
$RPM_BUILD_ROOT%{_iconsdir}/hicolor/32x32/apps/kvim.png
-install runtime/kvim48x48.png
$RPM_BUILD_ROOT%{_iconsdir}/hicolor/48x48/apps/kvim.png
-install runtime/kvim64x64.png
$RPM_BUILD_ROOT%{_iconsdir}/hicolor/64x64/apps/kvim.png
-install runtime/KVim.desktop $RPM_BUILD_ROOT%{_desktopdir}/kde
-install -d $RPM_BUILD_ROOT%{_datadir}/apps/kvim
-install runtime/kde-tips $RPM_BUILD_ROOT%{_datadir}/apps/kvim/tips
-%endif
-
# Bonobo
%if %{with bonobo}
install -d $RPM_BUILD_ROOT%{_libdir}/bonobo/servers
@@ -1042,12 +922,6 @@
%lang(ru) %{_mandir}/ru*/man1/view.1*
%lang(ru) %{_mandir}/ru*/man1/rview.1*
-%if %{with ispell}
-%files ispell
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/vim.ispell
-%endif
-
%files -n xxd
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/xxd
@@ -1195,17 +1069,6 @@
%{_desktopdir}/gvim-motif.desktop
%endif
-%if %{with kde}
-%files -n kvim
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/kvim
-%{_desktopdir}/kde/KVim.desktop
-%{_iconsdir}/hicolor/*/apps/kvim.png
-%{_iconsdir}/hicolor/*/actions/*make*.png
-%{_datadir}/apps/kvim
-%endif
-
-
%if %{with gtk}
%files -n gvim-gtk
%defattr(644,root,root,755)
@@ -1237,6 +1100,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.343 2006/03/29 21:57:39 arekm
+- updated (ispell dropped - there is builtin spell check; drop kvim; it's no
longer maintainer + broken by design)
+
Revision 1.342 2006/03/29 21:34:11 arekm
- package more files
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/vim.spec?r1=1.342&r2=1.343&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
