!11 Fix compilation errors caused by python upgrade
Merge pull request !11 from chengquan/master
This commit is contained in:
commit
5a0c51bfec
15
vim.spec
15
vim.spec
@ -7,11 +7,12 @@
|
|||||||
%{!?_with_netbeans__:%define _with_netbeans__ 1}
|
%{!?_with_netbeans__:%define _with_netbeans__ 1}
|
||||||
|
|
||||||
%define vimdir vim82
|
%define vimdir vim82
|
||||||
|
%define python_ver 3.8
|
||||||
|
|
||||||
Name: vim
|
Name: vim
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
Version: 8.2
|
Version: 8.2
|
||||||
Release: 1
|
Release: 2
|
||||||
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
|
||||||
@ -133,7 +134,7 @@ sed -i 's/vimrc/virc/' os_unix.h
|
|||||||
%configure --with-features=small --with-x=no --enable-multibyte --disable-netbeans \
|
%configure --with-features=small --with-x=no --enable-multibyte --disable-netbeans \
|
||||||
--disable-pythoninterp --disable-perlinterp --disable-tclinterp --with-tlib=ncurses \
|
--disable-pythoninterp --disable-perlinterp --disable-tclinterp --with-tlib=ncurses \
|
||||||
--enable-gui=no --disable-gpm --exec-prefix=/ \
|
--enable-gui=no --disable-gpm --exec-prefix=/ \
|
||||||
--enable-fail-if-missing \
|
--enable-fail-if-missing --with-python3-config-dir=/usr/lib/python%{python_ver}/config \
|
||||||
%if %{_with_selinux__}
|
%if %{_with_selinux__}
|
||||||
--enable-selinux \
|
--enable-selinux \
|
||||||
%else
|
%else
|
||||||
@ -147,7 +148,7 @@ mv os_unix.h.bak os_unix.h
|
|||||||
%configure --with-features=huge --enable-pythoninterp=dynamic --enable-python3interp=dynamic \
|
%configure --with-features=huge --enable-pythoninterp=dynamic --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 \
|
--enable-cscope --enable-fail-if-missing --with-python3-config-dir=/usr/lib/python%{python_ver}/config \
|
||||||
%if %{_with_netbeans__}
|
%if %{_with_netbeans__}
|
||||||
--enable-netbeans \
|
--enable-netbeans \
|
||||||
%else
|
%else
|
||||||
@ -173,7 +174,7 @@ mv os_unix.h.bak os_unix.h
|
|||||||
|
|
||||||
%configure --with-features=huge --enable-pythoninterp=dynamic --enable-python3interp=dynamic \
|
%configure --with-features=huge --enable-pythoninterp=dynamic --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 \
|
--enable-cscope --with-tlib=ncurses --with-python3-config-dir=/usr/lib/python%{python_ver}/config \
|
||||||
--enable-fail-if-missing \
|
--enable-fail-if-missing \
|
||||||
%if %{_with_netbeans__}
|
%if %{_with_netbeans__}
|
||||||
--enable-netbeans \
|
--enable-netbeans \
|
||||||
@ -419,6 +420,12 @@ popd
|
|||||||
%{_mandir}/man1/evim.*
|
%{_mandir}/man1/evim.*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jun 15 2020 chengquan<chengquan3@huawei.com> -2:8.2-2
|
||||||
|
- Type:bugfix
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:Fix compilation errors caused by python upgrade
|
||||||
|
|
||||||
* Thu Apr 16 2020 chengquan<chengquan3@huawei.com> -2:8.2-1
|
* Thu Apr 16 2020 chengquan<chengquan3@huawei.com> -2:8.2-1
|
||||||
- Type:enhancement
|
- Type:enhancement
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user