rebuild with perl 5.32

[packages/vim.git] / vim.spec

diff --git a/vim.spec b/vim.spec
index eb20dda9dbaea948fc045e95d99789213da6958f..df3ab2f1361e6e672f750da4802191c887c4300d 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -4,7 +4,7 @@
 %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
@@ -12,9 +12,11 @@
 %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
 
@@ -29,8 +31,8 @@
 # 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.1348
-%define                rel             1
+%define                ver             8.2.2529
+%define                rel             2
 Summary:       Vi IMproved - a Vi clone
 Summary(de.UTF-8):     VIsual editor iMproved
 Summary(es.UTF-8):     Editor visual incrementado
@@ -50,7 +52,7 @@ License:      Charityware
 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: 83775328978b2f7818001ca0dafd632c
+# Source0-md5: 9e108a0a9307fc578d365c97d2dc5b0d
 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
@@ -115,14 +117,14 @@ BuildRequires:    attr-devel
 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
@@ -137,6 +139,7 @@ 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
@@ -152,6 +155,11 @@ BuildRequires:     perl-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
@@ -449,9 +457,7 @@ Obsoletes:  vim-syntax-gitcommit
 Obsoletes:     vim-syntax-golang <= 1.3.3-1
 Obsoletes:     vim-syntax-lxc-docker <= 0.9.0-1
 Obsoletes:     vim-syntax-upstart
-%if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
-%endif
 
 %description rt
 This package contains macros, documentation, syntax configuration and
@@ -517,9 +523,7 @@ Summary:    Vim runtime extra files
 Summary(pl.UTF-8):     Dodatkowe pliki uruchomieniowe Vima
 Group:         Applications/Editors/Vim
 Requires:      %{name}-rt = %{epoch}:%{version}-%{release}
-%if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
-%endif
 
 %description rt-extras
 This package contains more runtime extra files, not really useful. If
@@ -537,9 +541,7 @@ Summary(pl.UTF-8):  Dokumentacja kontekstowa do Vima
 Group:         Applications/Editors/Vim
 Requires(post,postun): /usr/bin/vim
 Requires:      %{name}-rt = %{epoch}:%{version}-%{release}
-%if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
-%endif
 
 %description doc
 This package contains Vim documentation accessible from vim itself
@@ -554,9 +556,7 @@ Summary:    English dictionaries for VIMspell
 Summary(pl.UTF-8):     Angielskie słowniki dla VIMspella
 Group:         Applications/Editors/Vim
 Requires:      %{name}-rt = %{epoch}:%{version}-%{release}
-%if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
-%endif
 
 %description spell-en
 English dictionaries for VIMspell.
@@ -572,9 +572,7 @@ Group:              Applications/Editors/Vim
 Requires:      %{name}-rt = %{epoch}:%{version}-%{release}
 Requires:      mktemp
 Requires:      vim-editor = %{epoch}:%{version}-%{release}
-%if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
-%endif
 
 %description tutor
 This package contains Vim tutorial.
@@ -776,7 +774,7 @@ cp -p runtime/gvim.desktop gvim-motif.desktop
 %patch12 -p1
 %patch14 -p1
 %patch15 -p1
-%patch17 -p0
+%patch17 -p1
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
@@ -843,6 +841,7 @@ build() {
                --%{!?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} \
@@ -869,6 +868,7 @@ build vim.static \
        --disable-gui \
        --without-x \
        --with-features=small \
+       --disable-canberra \
        --disable-luainterp \
        --disable-perlinterp \
        --disable-pythoninterp \
@@ -876,7 +876,7 @@ build vim.static \
        --disable-tclinterp \
        --disable-cscope \
        --disable-gpm \
-       --disable-multibyte \
+       --enable-multibyte \
        --disable-nls
 
 LDFLAGS="%{rpmldflags}"
@@ -887,6 +887,7 @@ build vim.light \
        --disable-gui \
        --without-x \
        --with-features=small \
+       --disable-canberra \
        --disable-luainterp \
        --disable-perlinterp \
        --disable-pythoninterp \
@@ -899,13 +900,15 @@ build vim.light \
 
 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
 
@@ -915,6 +918,7 @@ build gvim.athena \
        --enable-gui=athena \
        --with-x \
        --enable-fontset \
+       --disable-canberra \
        --disable-gpm \
        --without-gnome
 
@@ -927,6 +931,7 @@ build gvim.motif \
        --with-x \
        --enable-multibyte \
        --enable-fontset \
+       --disable-canberra \
        --disable-gpm \
        --without-gnome
 
@@ -943,6 +948,7 @@ build gvim.gtk \
        --enable-gtk2-check \
 %endif
        --with-x \
+       --disable-canberra \
        --disable-gpm
 
 %endif
@@ -967,8 +973,10 @@ build vim.heavy \
        --enable-luainterp \
        --enable-perlinterp \
        --enable-pythoninterp \
+       --enable-python3interp \
        --enable-rubyinterp \
        --enable-tclinterp \
+       --disable-canberra \
        --disable-gpm
 
 build gvim.heavy \
@@ -980,6 +988,7 @@ build gvim.heavy \
        --enable-luainterp \
        --enable-perlinterp \
        --enable-pythoninterp \
+       --enable-python3interp \
        --enable-rubyinterp \
        --enable-tclinterp \
        --disable-gpm
@@ -1165,23 +1174,23 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/vimdiff
 %{_mandir}/man1/rvim.1*
 %{_mandir}/man1/vimdiff.1*
+%lang(da) %{_mandir}/da/man1/rvim.1*
+%lang(da) %{_mandir}/da/man1/vimdiff.1*
+%lang(de) %{_mandir}/de/man1/rvim.1*
 %lang(fi) %{_mandir}/fi/man1/rvim.1*
 %lang(fr) %{_mandir}/fr/man1/rvim.1*
 %lang(fr) %{_mandir}/fr/man1/vimdiff.1*
 %lang(id) %{_mandir}/id/man1/rvim.1*
-%lang(id) %{_mandir}/id/man1/vim.1*
 %lang(it) %{_mandir}/it/man1/rvim.1*
-%lang(it) %{_mandir}/it/man1/vim.1*
 %lang(it) %{_mandir}/it/man1/vimdiff.1*
 %lang(ja) %{_mandir}/ja/man1/rvim.1*
-%lang(ja) %{_mandir}/ja/man1/vim.1*
 %lang(ja) %{_mandir}/ja/man1/vimdiff.1*
 %lang(pl) %{_mandir}/pl/man1/rvim.1*
-%lang(pl) %{_mandir}/pl/man1/vim.1*
 %lang(pl) %{_mandir}/pl/man1/vimdiff.1*
 %lang(ru) %{_mandir}/ru/man1/rvim.1*
-%lang(ru) %{_mandir}/ru/man1/vim.1*
 %lang(ru) %{_mandir}/ru/man1/vimdiff.1*
+%lang(tr) %{_mandir}/tr/man1/rvim.1*
+%lang(tr) %{_mandir}/tr/man1/vimdiff.1*
 %{_desktopdir}/vim.desktop
 
 %if %{with static}
@@ -1196,6 +1205,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/ex.1*
 %{_mandir}/man1/view.1*
 %{_mandir}/man1/rview.1*
+%lang(da) %{_mandir}/da/man1/ex.1*
+%lang(da) %{_mandir}/da/man1/rview.1*
+%lang(da) %{_mandir}/da/man1/view.1*
+%lang(de) %{_mandir}/de/man1/ex.1*
+%lang(de) %{_mandir}/de/man1/rview.1*
+%lang(de) %{_mandir}/de/man1/view.1*
 %lang(fi) %{_mandir}/fi/man1/vi.1*
 %lang(fi) %{_mandir}/fi/man1/ex.1*
 %lang(fi) %{_mandir}/fi/man1/view.1*
@@ -1223,6 +1238,9 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ru) %{_mandir}/ru/man1/ex.1*
 %lang(ru) %{_mandir}/ru/man1/view.1*
 %lang(ru) %{_mandir}/ru/man1/rview.1*
+%lang(tr) %{_mandir}/tr/man1/ex.1*
+%lang(tr) %{_mandir}/tr/man1/view.1*
+%lang(tr) %{_mandir}/tr/man1/rview.1*
 
 %files -n xxd
 %defattr(644,root,root,755)
@@ -1301,6 +1319,8 @@ rm -rf $RPM_BUILD_ROOT
 %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*
@@ -1309,6 +1329,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ca) %{_datadir}/vim/lang/menu_ca*
 %lang(cs) %{_datadir}/vim/lang/menu_cs*
 %lang(cs) %{_datadir}/vim/lang/menu_*czech*
+%lang(da) %{_datadir}/vim/lang/menu_da*
 %lang(de) %{_datadir}/vim/lang/menu_de*
 %lang(de) %{_datadir}/vim/lang/menu_*german*
 %lang(en_GB) %{_datadir}/vim/lang/menu_en_gb*
@@ -1325,6 +1346,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(fi) %{_datadir}/vim/lang/menu_finnish_finland.1252.vim
 %lang(fr) %{_datadir}/vim/lang/menu_fr*
 %lang(hu) %{_datadir}/vim/lang/menu_hu*
+%lang(is) %{_datadir}/vim/lang/menu_is*
 %lang(it) %{_datadir}/vim/lang/menu_it*
 %lang(ja) %{_datadir}/vim/lang/menu_ja*
 %lang(ko) %{_datadir}/vim/lang/menu_ko*
@@ -1339,6 +1361,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(sl) %{_datadir}/vim/lang/menu_sl_si*
 %lang(sr) %{_datadir}/vim/lang/menu_sr*
 %lang(sv) %{_datadir}/vim/lang/menu_sv*
+%lang(tr) %{_datadir}/vim/lang/menu_tr*
 %lang(uk) %{_datadir}/vim/lang/menu_uk*
 %lang(vi) %{_datadir}/vim/lang/menu_vi*
 %lang(zh_CN) %{_datadir}/vim/lang/menu_zh.cp936*
@@ -1356,8 +1379,16 @@ rm -rf $RPM_BUILD_ROOT
 %lang(yi) %{_datadir}/vim/spell/yi.*
 
 %{_mandir}/man1/vim.1*
+%lang(da) %{_mandir}/da/man1/vim.1*
+%lang(de) %{_mandir}/de/man1/vim.1*
 %lang(fi) %{_mandir}/fi/man1/vim.1*
 %lang(fr) %{_mandir}/fr/man1/vim.1*
+%lang(id) %{_mandir}/id/man1/vim.1*
+%lang(it) %{_mandir}/it/man1/vim.1*
+%lang(ja) %{_mandir}/ja/man1/vim.1*
+%lang(pl) %{_mandir}/pl/man1/vim.1*
+%lang(ru) %{_mandir}/ru/man1/vim.1*
+%lang(tr) %{_mandir}/tr/man1/vim.1*
 %{_pixmapsdir}/gvim.png
 
 # plugins in base -rt package
@@ -1392,7 +1423,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/vimtutor
 %dir %{_datadir}/vim/tutor
-%dir %{_datadir}/vim/tutor/tutor
+%{_datadir}/vim/tutor/tutor
 
 %{_datadir}/vim/tutor/README.txt
 %{_datadir}/vim/tutor/tutor.vim
@@ -1408,6 +1439,8 @@ rm -rf $RPM_BUILD_ROOT
 %lang(cs) %{_datadir}/vim/tutor/tutor.cs
 %lang(cs) %{_datadir}/vim/tutor/tutor.cs.cp1250
 %lang(cs) %{_datadir}/vim/tutor/tutor.cs.utf-8
+%lang(da) %{_datadir}/vim/tutor/tutor.da
+%lang(da) %{_datadir}/vim/tutor/tutor.da.utf-8
 %lang(de) %{_datadir}/vim/tutor/tutor.de
 %lang(de) %{_datadir}/vim/tutor/tutor.de.utf-8
 %lang(el) %{_datadir}/vim/tutor/tutor.el
@@ -1430,9 +1463,10 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ja) %{_datadir}/vim/tutor/tutor.ja.euc
 %lang(ja) %{_datadir}/vim/tutor/tutor.ja.sjis
 %lang(ja) %{_datadir}/vim/tutor/tutor.ja.utf-8
+%lang(ko) %{_datadir}/vim/tutor/tutor.ko
 %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(lv) %{_datadir}/vim/tutor/tutor.lv.utf-8
 %lang(nl) %{_datadir}/vim/tutor/tutor.nl
 %lang(nl) %{_datadir}/vim/tutor/tutor.nl.utf-8
 %lang(nb) %{_datadir}/vim/tutor/tutor.nb
@@ -1463,11 +1497,13 @@ rm -rf $RPM_BUILD_ROOT
 %lang(zh_TW) %{_datadir}/vim/tutor/tutor.zh_tw.utf-8
 
 %{_mandir}/man1/vimtutor.1*
+%lang(da) %{_mandir}/da/man1/vimtutor.1*
 %lang(fr) %{_mandir}/fr/man1/vimtutor.1*
 %lang(it) %{_mandir}/it/man1/vimtutor.1*
 %lang(ja) %{_mandir}/ja/man1/vimtutor.1*
 %lang(pl) %{_mandir}/pl/man1/vimtutor.1*
 %lang(ru) %{_mandir}/ru/man1/vimtutor.1*
+%lang(tr) %{_mandir}/tr/man1/vimtutor.1*
 
 %if %{with x11}
 %files -n vimx
@@ -1518,32 +1554,43 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/rgvim
 %{_mandir}/man1/eview.1*
 %{_mandir}/man1/evim.1*
-%{_mandir}/man1/gvi*
-%{_mandir}/man1/rgv*
-%lang(fi) %{_mandir}/fi/man1/gvi*
-%lang(fi) %{_mandir}/fi/man1/rgv*
+%{_mandir}/man1/gview.1*
+%{_mandir}/man1/gvim.1*
+%{_mandir}/man1/gvimdiff.1*
+%{_mandir}/man1/rgview.1*
+%{_mandir}/man1/rgvim.1*
+%lang(da) %{_mandir}/da/man1/gvi*.1*
+%lang(da) %{_mandir}/da/man1/rgv*.1*
+%lang(de) %{_mandir}/de/man1/gvi*.1*
+%lang(de) %{_mandir}/de/man1/rgv*.1*
+%lang(fi) %{_mandir}/fi/man1/gvi*.1*
+%lang(fi) %{_mandir}/fi/man1/rgv*.1*
 %lang(fr) %{_mandir}/fr/man1/eview.1*
 %lang(fr) %{_mandir}/fr/man1/evim.1*
-%lang(fr) %{_mandir}/fr/man1/gvi*
-%lang(fr) %{_mandir}/fr/man1/rgv*
-%lang(id) %{_mandir}/id/man1/gvi*
-%lang(id) %{_mandir}/id/man1/rgv*
+%lang(fr) %{_mandir}/fr/man1/gvi*.1*
+%lang(fr) %{_mandir}/fr/man1/rgv*.1*
+%lang(id) %{_mandir}/id/man1/gvi*.1*
+%lang(id) %{_mandir}/id/man1/rgv*.1*
 %lang(it) %{_mandir}/it/man1/eview.1*
 %lang(it) %{_mandir}/it/man1/evim.1*
-%lang(it) %{_mandir}/it/man1/gvi*
-%lang(it) %{_mandir}/it/man1/rgv*
+%lang(it) %{_mandir}/it/man1/gvi*.1*
+%lang(it) %{_mandir}/it/man1/rgv*.1*
 %lang(ja) %{_mandir}/ja/man1/eview.1*
 %lang(ja) %{_mandir}/ja/man1/evim.1*
-%lang(ja) %{_mandir}/ja/man1/gvi*
-%lang(ja) %{_mandir}/ja/man1/rgv*
+%lang(ja) %{_mandir}/ja/man1/gvi*.1*
+%lang(ja) %{_mandir}/ja/man1/rgv*.1*
 %lang(pl) %{_mandir}/pl/man1/eview.1*
 %lang(pl) %{_mandir}/pl/man1/evim.1*
-%lang(pl) %{_mandir}/pl/man1/gvi*
-%lang(pl) %{_mandir}/pl/man1/rgv*
+%lang(pl) %{_mandir}/pl/man1/gvi*.1*
+%lang(pl) %{_mandir}/pl/man1/rgv*.1*
 %lang(ru) %{_mandir}/ru/man1/eview.1*
 %lang(ru) %{_mandir}/ru/man1/evim.1*
-%lang(ru) %{_mandir}/ru/man1/gvi*
-%lang(ru) %{_mandir}/ru/man1/rgv*
+%lang(ru) %{_mandir}/ru/man1/gvi*.1*
+%lang(ru) %{_mandir}/ru/man1/rgv*.1*
+%lang(tr) %{_mandir}/tr/man1/eview.1*
+%lang(tr) %{_mandir}/tr/man1/evim.1*
+%lang(tr) %{_mandir}/tr/man1/gvi*.1*
+%lang(tr) %{_mandir}/tr/man1/rgv*.1*
 %{_desktopdir}/gvim-gtk.desktop
 %endif