%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 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 light # don't build light (minimal, ncurses, but not static)
+%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
%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.0022
-%define rel 1
+%define ver 8.1.0005
+%define rel 2
Summary: Vi IMproved - a Vi clone
Summary(de.UTF-8): VIsual editor iMproved
Summary(es.UTF-8): Editor visual incrementado
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: a1fcbd6d84b6ecf9c4ad061b4e24a9de
+# Source0-md5: b758c94c83c3fe9de2f2361be429c941
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
Patch41: %{name}-lua.patch
URL: http://www.vim.org/
BuildRequires: acl-devel
-BuildRequires: autoconf
+BuildRequires: attr-devel
+BuildRequires: autoconf >= 2.12
BuildRequires: gpm-devel
%if "%{pld_release}" == "ac"
-%{?with_athena:BuildRequires: XFree86-devel}
+%if %{with athena} || %{with x11}
+BuildRequires: XFree86-devel
+%endif
BuildRequires: gettext-devel
%else
BuildRequires: gettext-tools
%{?with_athena:BuildRequires: xorg-lib-libXaw-devel}
+%if %{with x11} || %{with gui}
+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
+%else
BuildRequires: gtk+2-devel >= 2:2.6.0
%endif
+%endif
%{?with_gnome:BuildRequires: libgnomeui-devel >= 2.2.0.1}
%if %{with selinux} || %{with heavy}
BuildRequires: libselinux-devel
%endif
%if %{with lua} || %{with heavy}
-BuildRequires: lua52-devel
+BuildRequires: lua52-devel >= 5.2
%endif
%{?with_motif:BuildRequires: motif-devel}
BuildRequires: ncurses-devel
BuildRequires: perl-devel
%endif
%if %{with python} || %{with heavy}
-BuildRequires: python-devel
+BuildRequires: python-devel >= 2.3
BuildRequires: rpm-pythonprov
%endif
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.718
%if %{with ruby} || %{with heavy}
-BuildRequires: ruby-devel
+BuildRequires: ruby-devel >= 1.6.0
%endif
%if %{with tcl} || %{with heavy}
-BuildRequires: tcl-devel
+BuildRequires: tcl-devel >= 8.0
%endif
Obsoletes: kvim
%if %{with static}
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
Summary(hu.UTF-8): A gvim legteljesebb verziója
Summary(pl.UTF-8): W pełni funkcjonalna wersja Vima z interfejsem dla X Window
Group: Applications/Editors/Vim
-Requires(post,postun): gtk+2
+Requires(post,postun): gtk-update-icon-cache
+Requires(post,postun): hicolor-icon-theme
Requires: %{name}-rt = %{epoch}:%{version}-%{release}
Requires: %{name}-rt-extras = %{epoch}:%{version}-%{release}
Requires: iconv
%patch2 -p1
%patch3 -p1
-%patch4 -p1
+
%patch5 -p1
%patch6 -p1
%patch7 -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
--without-x \
--with-features=huge
+%if %{with x11}
build vimx \
--disable-gui \
--with-x \
--with-features=huge
+%endif
%if %{with athena}
build gvim.athena \
%if %{with gtk}
build gvim.gtk \
--with-features=huge \
+%if %{with gtk3}
+ --enable-gui=gtk3 \
+ --enable-gtk3-check \
+%else
--enable-gui=gtk2 \
--enable-gtk2-check \
+%endif
--with-x \
--disable-gpm
--enable-rubyinterp \
--enable-tclinterp \
--disable-gpm
-
%endif
%{__make} xxd/xxd languages
# 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.ncurses $RPM_BUILD_ROOT/bin/vi
ln -sf /bin/vi $RPM_BUILD_ROOT%{_bindir}/vim
%endif
+%if %{with x11}
install -p src/bin/vimx $RPM_BUILD_ROOT%{_bindir}/vimx
+%endif
install -p src/xxd/xxd $RPM_BUILD_ROOT%{_bindir}/xxd
install -p src/vimtutor $RPM_BUILD_ROOT%{_bindir}/vimtutor
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
%update_desktop_database_postun
%update_icon_cache hicolor
+%post -n gvim-heavy
+%update_icon_cache hicolor
+
+%postun -n gvim-heavy
+%update_icon_cache hicolor
+
%files
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/rvim
%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
%lang(ja) %{_datadir}/vim/tutor/tutor.ja.utf-8
%lang(ko) %{_datadir}/vim/tutor/tutor.ko.euc
%lang(ko) %{_datadir}/vim/tutor/tutor.ko.utf-8
+%lang(lv) %{_datadir}/vim/tutor/tutor.lv
%lang(nl) %{_datadir}/vim/tutor/tutor.nl
%lang(nl) %{_datadir}/vim/tutor/tutor.nl.utf-8
%lang(nb) %{_datadir}/vim/tutor/tutor.nb
%lang(pl) %{_mandir}/pl/man1/vimtutor.1*
%lang(ru) %{_mandir}/ru/man1/vimtutor.1*
+%if %{with x11}
%files -n vimx
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/vimx
+%endif
%if %{with heavy}
%files heavy