packages/vim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!20 remove python2

Browse Source 
From: @jlwwlsqc
Reviewed-by: @hanxinke
Signed-off-by: @hanxinke
This commit is contained in:
openeuler-ci-bot 2020-11-03 10:14:04 +08:00 committed by Gitee
commit a7a690d9e6
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vim.spec
View File

@ -12,7 +12,7 @@
Name: vim Name: vim
Epoch: 2 Epoch: 2
Version: 8.2 Version: 8.2
Release: 5 Release: 6
Summary: Vim is a highly configurable text editor for efficiently creating and changing any kind of text. Summary: Vim is a highly configurable text editor for efficiently creating and changing any kind of text.
License: Vim and MIT License: Vim and MIT
URL: http://www.vim.org URL: http://www.vim.org
@ -37,7 +37,7 @@ Patch0014: backport-Fix-build-failuers-with-perl-5.32.patch
Patch9000: bugfix-rm-modify-info-version.patch Patch9000: bugfix-rm-modify-info-version.patch
BuildRequires: autoconf python-devel python3-devel ncurses-devel gettext perl-devel perl-generators BuildRequires: autoconf python3-devel ncurses-devel gettext perl-devel perl-generators
BuildRequires: perl(ExtUtils::Embed) perl(ExtUtils::ParseXS) libacl-devel gpm-devel file BuildRequires: perl(ExtUtils::Embed) perl(ExtUtils::ParseXS) libacl-devel gpm-devel file
BuildRequires: desktop-file-utils >= 0.2.93 BuildRequires: desktop-file-utils >= 0.2.93
%if %{_with_selinux__} %if %{_with_selinux__}
@ -79,7 +79,7 @@ The minimal package provides a minimal version of vim editor. It will be install
Summary: This is a package containing enhanced vim editor. Summary: This is a package containing enhanced vim editor.
Requires: vim-common = %{epoch}:%{version}-%{release} which gpm-libs Requires: vim-common = %{epoch}:%{version}-%{release} which gpm-libs
Provides: vim = %{version}-%{release} %{_bindir}/mergetool %{_bindir}/vim Provides: vim = %{version}-%{release} %{_bindir}/mergetool %{_bindir}/vim
Suggests: python2 python2-libs python3 python3-libs Suggests: python3 python3-libs
Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Suggests: perl-libs perl-devel Suggests: perl-libs perl-devel
%if %{_with_ruby__} %if %{_with_ruby__}
@ -105,7 +105,7 @@ BuildRequires: gtk3-devel libX11-devel libSM-devel libXt-devel libXpm-devel lib
Requires: vim-common = %{epoch}:%{version}-%{release} libattr >= 2.4 gtk3 hicolor-icon-theme Requires: vim-common = %{epoch}:%{version}-%{release} libattr >= 2.4 gtk3 hicolor-icon-theme
Requires: libICE libSM libX11 libXt cairo gdk-pixbuf2 pango Requires: libICE libSM libX11 libXt cairo gdk-pixbuf2 pango
Provides: gvim = %{version}-%{release} %{_bindir}/mergetool %{_bindir}/gvim Provides: gvim = %{version}-%{release} %{_bindir}/mergetool %{_bindir}/gvim
Suggests: python2 python2-libs python3 python3-libs Suggests: python3 python3-libs
Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Suggests: perl-libs perl-devel Suggests: perl-libs perl-devel
%if %{_with_ruby__} %if %{_with_ruby__}
@ -147,7 +147,7 @@ sed -i 's/vimrc/virc/' os_unix.h
mv os_unix.h.bak os_unix.h mv os_unix.h.bak os_unix.h
%configure --with-features=huge --enable-pythoninterp=dynamic --enable-python3interp=dynamic \ %configure --with-features=huge --enable-python3interp=dynamic \
--enable-perlinterp=dynamic --disable-tclinterp --with-x=yes --enable-xim --enable-multibyte \ --enable-perlinterp=dynamic --disable-tclinterp --with-x=yes --enable-xim --enable-multibyte \
--with-tlib=ncurses --enable-gtk3-check --enable-gui=gtk3 \ --with-tlib=ncurses --enable-gtk3-check --enable-gui=gtk3 \
--enable-cscope --enable-fail-if-missing --with-python3-config-dir=/usr/lib64/python%{python_ver}/config-%{python_ver}-%{_arch}-linux-gnu \ --enable-cscope --enable-fail-if-missing --with-python3-config-dir=/usr/lib64/python%{python_ver}/config-%{python_ver}-%{_arch}-linux-gnu \
@ -174,7 +174,7 @@ mv os_unix.h.bak os_unix.h
%{_make_cmd__ vim-X11} %{_make_cmd__ vim-X11}
%configure --with-features=huge --enable-pythoninterp=dynamic --enable-python3interp=dynamic \ %configure --with-features=huge --enable-python3interp=dynamic \
--enable-perlinterp=dynamic --disable-tclinterp --with-x=no --enable-gui=no --enable-multibyte \ --enable-perlinterp=dynamic --disable-tclinterp --with-x=no --enable-gui=no --enable-multibyte \
--enable-cscope --with-tlib=ncurses --with-python3-config-dir=/usr/lib64/python%{python_ver}/config-%{python_ver}-%{_arch}-linux-gnu \ --enable-cscope --with-tlib=ncurses --with-python3-config-dir=/usr/lib64/python%{python_ver}/config-%{python_ver}-%{_arch}-linux-gnu \
--enable-fail-if-missing \ --enable-fail-if-missing \
@ -422,6 +422,12 @@ popd
%{_mandir}/man1/evim.* %{_mandir}/man1/evim.*
%changelog %changelog
* Mon Nov 2 2020 wangjie<wangjie294@huawei.com> -2:8.2-6
- Type:NA
- ID:NA
- SUG:NA
- DESC:remove python2
* Wed Oct 14 2020 Jie Yang<yangjieyj.yang@huawei.com> - 2:8.2-5 * Wed Oct 14 2020 Jie Yang<yangjieyj.yang@huawei.com> - 2:8.2-5
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA