%bcond_without athena # don't build Athena Widgets-based gvim
%bcond_without motif # don't build Motif-based gvim
%bcond_without gtk # don't build GTK+-based gvim support
-%bcond_with gtk3 # use GTK+ 3.x instead of 2.x
+%bcond_without gtk3 # use GTK+ 2.x instead of 3.x
%bcond_without gnome # don't build GNOME-based gvim support
%bcond_without heavy # don't build heavy (full-featured GNOME-based gvim/vim)
%bcond_without gui # don't build any GUI
%bcond_without x11 # don't build vimx (non-GUI with X11 clipboard support)
%bcond_with lua # with Lua interp in vim package
%bcond_with perl # with Perl interp in vim package
-%bcond_with python # with Python interp in vim package
+%bcond_with python # with Python 2 interp in vim package
+%bcond_with python3 # with Python 3 interp in vim package
%bcond_with ruby # with Ruby interp in vim package
%bcond_with tcl # with Tcl interp
+%bcond_with x # with X11 support
%bcond_without selinux # without selinux support
%bcond_without home_etc # without home_etc support
%endif
# Command to check for latest patch:
-# wget ftp://ftp.vim.org/pub/editors/vim/patches/7.4/MD5SUMS -O sources
-# tail -n1 sources | awk '{print $2}'
+# wget ftp://ftp.vim.org/pub/editors/vim/patches/8.0/MD5SUMS -O - | tail -n1 | awk '{print $2}'
# VCS Commits: https://github.com/vim/vim/commits/master
-%define ver 8.0.0066
+%define ver 8.2.1524
%define rel 1
Summary: Vi IMproved - a Vi clone
Summary(de.UTF-8): VIsual editor iMproved
Group: Applications/Editors/Vim
#Source0: ftp://ftp.vim.org/pub/vim/unix/%{name}-%{ver}.tar.bz2
Source0: https://github.com/vim/vim/archive/v%{ver}.tar.gz
-# Source0-md5: b6d9befe6f442149023041df7ebeb878
+# Source0-md5: 00e6782f70651a49b976c85ec0ab1895
Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: bc4d1e115ca506ad7751b9bd2b773a7f
Source2: http://skawina.eu.org/mikolaj/usr_doc_pl.zip
Patch2: %{name}-paths.patch
Patch3: %{name}-no_libelf.patch
-Patch4: %{name}-egrep.patch
+
Patch5: %{name}-awk.patch
Patch6: %{name}-filetype_vim-perl_tests.patch
Patch7: %{name}-apache.patch
Patch29: %{name}-phpscript.patch
Patch30: %{name}-pam.patch
Patch32: %{name}-localedir.patch
-Patch33: %{name}-locales.patch
+
Patch34: %{name}-rtdir.patch
Patch35: %{name}-ft-mib.patch
Patch36: %{name}-ft-lib-udevrules.patch
BuildRequires: autoconf >= 2.12
BuildRequires: gpm-devel
%if "%{pld_release}" == "ac"
-%if %{with athena} || %{with x11}
+%if %{with athena} || %{with x11} || %{with x}
BuildRequires: XFree86-devel
%endif
BuildRequires: gettext-devel
%else
BuildRequires: gettext-tools
%{?with_athena:BuildRequires: xorg-lib-libXaw-devel}
-%if %{with x11} || %{with gui}
+%if %{with x11} || %{with gui} || %{with x}
BuildRequires: xorg-lib-libICE-devel
BuildRequires: xorg-lib-libSM-devel
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXt-devel
%endif
%endif
+BuildRequires: grep
%if %{with gtk} || %{with heavy}
%if %{with gtk3}
BuildRequires: gtk+3-devel >= 3.0
BuildRequires: gtk+2-devel >= 2:2.6.0
%endif
%endif
+BuildRequires: libcanberra-devel
%{?with_gnome:BuildRequires: libgnomeui-devel >= 2.2.0.1}
%if %{with selinux} || %{with heavy}
BuildRequires: libselinux-devel
%endif
%if %{with python} || %{with heavy}
BuildRequires: python-devel >= 2.3
+%endif
+%if %{with python3} || %{with heavy}
+BuildRequires: python3-devel
+%endif
+%if %{with python} || %{with python3} || %{with heavy}
BuildRequires: rpm-pythonprov
%endif
BuildRequires: rpm >= 4.4.9-56
Requires: vim-plugin-securemodelines
Obsoletes: gvim-bonobo
Obsoletes: vim-common
+Obsoletes: vim-syntax-docker < 1.10.1
Obsoletes: vim-syntax-gitcommit
Obsoletes: vim-syntax-golang <= 1.3.3-1
Obsoletes: vim-syntax-lxc-docker <= 0.9.0-1
-Obsoletes: vim-syntax-docker < 1.10.1
Obsoletes: vim-syntax-upstart
%if "%{_rpmversion}" >= "5"
BuildArch: noarch
%patch2 -p1
%patch3 -p1
-%patch4 -p1
+
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch12 -p1
%patch14 -p1
%patch15 -p1
-%patch17 -p0
+%patch17 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch29 -p1
%patch30 -p1
%patch32 -p1
-%patch33 -p1
+
%patch34 -p1
%patch35 -p1
%patch36 -p1
%{__unzip} -qd runtime/doc %{SOURCE2}
-# remove unsupported locales
-%{__rm} src/po/zh_{CN,TW}.UTF-8.po
-%{__rm} runtime/lang/menu_zh_{cn,tw}.utf-8.vim
-
-# fix nb/no
-%{__mv} src/po/n{o,b}.po
-%{__mv} runtime/tutor/tutor.n{o,b}
-%{__mv} runtime/tutor/tutor.n{o,b}.utf-8
-%{__mv} runtime/lang/menu_n{o,b}.latin1.vim
-%{__mv} runtime/lang/menu_n{o,b}.utf-8.vim
-%{__mv} runtime/lang/menu_n{o,b}_no.latin1.vim
-%{__mv} runtime/lang/menu_n{o,b}_no.utf-8.vim
-
# not info files but some binary files for Amiga:
# Amiga Workbench drawer icon
# Amiga Workbench project icon
--%{!?with_lua:dis}%{?with_lua:en}able-luainterp \
--%{!?with_perl:dis}%{?with_perl:en}able-perlinterp \
--%{!?with_python:dis}%{?with_python:en}able-pythoninterp \
+ --%{!?with_python3:dis}%{?with_python3:en}able-python3interp \
--%{!?with_ruby:dis}%{?with_ruby:en}able-rubyinterp \
--%{!?with_tcl:dis}%{?with_tcl:en}able-tclinterp \
%{!?with_selinux:--disable-selinux} \
--disable-gui \
--without-x \
--with-features=small \
+ --disable-canberra \
--disable-luainterp \
--disable-perlinterp \
--disable-pythoninterp \
--disable-tclinterp \
--disable-cscope \
--disable-gpm \
- --disable-multibyte \
+ --enable-multibyte \
--disable-nls
LDFLAGS="%{rpmldflags}"
--disable-gui \
--without-x \
--with-features=small \
+ --disable-canberra \
--disable-luainterp \
--disable-perlinterp \
--disable-pythoninterp \
build vim.ncurses \
--disable-gui \
- --without-x \
+ %{__with_without x} \
+ --disable-canberra \
--with-features=huge
%if %{with x11}
build vimx \
--disable-gui \
--with-x \
+ --disable-canberra \
--with-features=huge
%endif
--enable-gui=athena \
--with-x \
--enable-fontset \
+ --disable-canberra \
--disable-gpm \
--without-gnome
--with-x \
--enable-multibyte \
--enable-fontset \
+ --disable-canberra \
--disable-gpm \
--without-gnome
--enable-gtk2-check \
%endif
--with-x \
+ --disable-canberra \
--disable-gpm
%endif
--enable-luainterp \
--enable-perlinterp \
--enable-pythoninterp \
+ --enable-python3interp \
--enable-rubyinterp \
--enable-tclinterp \
+ --disable-canberra \
--disable-gpm
build gvim.heavy \
--enable-luainterp \
--enable-perlinterp \
--enable-pythoninterp \
+ --enable-python3interp \
--enable-rubyinterp \
--enable-tclinterp \
--disable-gpm
# generic gvim from upstream, but we have bunch of subpackages
%{__rm} $RPM_BUILD_ROOT%{_desktopdir}/gvim.desktop
-# not supported locales added by 7.3.764 or later
+# fix nb/no
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/vim/tutor/tutor.n{o,b}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/vim/tutor/tutor.n{o,b}.utf-8
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/vim/lang/menu_n{o,b}.latin1.vim
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/vim/lang/menu_n{o,b}.utf-8.vim
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/vim/lang/menu_n{o,b}_no.latin1.vim
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/vim/lang/menu_n{o,b}_no.utf-8.vim
+
+# remove unsupported locales
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ko.UTF-8
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/no
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/zh_CN.UTF-8
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/zh_TW.UTF-8
%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/cs.cp1250
%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ja.sjis
%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ja.euc-jp
%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/sk.cp1250
%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/uk.cp1251
%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/zh_CN.cp936
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/vim/lang/menu_zh_{cn,tw}.utf-8.vim
%find_lang %{name}
install -p src/bin/vim.light $RPM_BUILD_ROOT%{_bindir}
%endif
+install -d $RPM_BUILD_ROOT%{_pixmapsdir}
+mv $RPM_BUILD_ROOT{%{_iconsdir}/hicolor/48x48/apps,%{_pixmapsdir}}/gvim.png
+
# locolor scheme no longer supported
%{__rm} -r $RPM_BUILD_ROOT%{_iconsdir}/locolor
%dir %{_datadir}/vim/autoload
%{_datadir}/vim/autoload/*complete.vim
%doc %{_datadir}/vim/autoload/README.txt
+%dir %{_datadir}/vim/autoload/dist
+%{_datadir}/vim/autoload/dist/ft.vim
%dir %{_datadir}/vim/ftdetect
%dir %{_datadir}/vim/colors
%doc %{_datadir}/vim/colors/README.txt
%{_datadir}/vim/colors/*.vim
+%dir %{_datadir}/vim/colors/tools
+%{_datadir}/vim/colors/tools/check_colors.vim
%dir %{_datadir}/vim/lang
%doc %{_datadir}/vim/lang/README*
%{_mandir}/man1/vim.1*
%lang(fi) %{_mandir}/fi/man1/vim.1*
%lang(fr) %{_mandir}/fr/man1/vim.1*
-%{_iconsdir}/hicolor/48x48/apps/gvim.png
+%{_pixmapsdir}/gvim.png
# plugins in base -rt package
%{_datadir}/vim/autoload/gzip.vim
projects / packages / vim.git / blobdiff