rpms/vim
6
0
Fork 0
Code Issues Pull Requests Releases Activity

install vim-minimal profiles under different name to avoid future conflicts

Browse Source
This commit is contained in:
Zdenek Dohnal 2020-12-18 08:38:09 +01:00
parent 86943b30a6
commit 097601b324
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vim.spec
View File

@ -21,7 +21,7 @@ Summary: The VIM editor
URL: http://www.vim.org/ URL: http://www.vim.org/
Name: vim Name: vim
Version: %{baseversion}.%{patchlevel} Version: %{baseversion}.%{patchlevel}
Release: 1%{?dist} Release: 2%{?dist}
License: Vim and MIT License: Vim and MIT
Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
Source1: vim.sh Source1: vim.sh
@ -128,7 +128,8 @@ Summary: A minimal version of the VIM editor
# conflicts in package because of manpage move (bug #1599663) # conflicts in package because of manpage move (bug #1599663)
Conflicts: %{name}-common < %{epoch}:8.1.1-1 Conflicts: %{name}-common < %{epoch}:8.1.1-1
# now vim-minimal ships vim.sh, vim.csh and vim.fish too, so we need to conflict # now vim-minimal ships vim.sh, vim.csh and vim.fish too, so we need to conflict
Conflicts: vim-enhanced < 2:8.2.1885-2 # remove when a new RHEL is released (current 8)
Conflicts: vim-enhanced <= 2:8.2.2146-2
Provides: vi Provides: vi
Provides: %{_bindir}/vi Provides: %{_bindir}/vi
@ -144,7 +145,8 @@ only available when the vim-common package is installed.
%package enhanced %package enhanced
Summary: A version of the VIM editor which includes recent enhancements Summary: A version of the VIM editor which includes recent enhancements
# now vim-minimal ships vim.sh, vim.csh and vim.fish too, so we need to conflict # now vim-minimal ships vim.sh, vim.csh and vim.fish too, so we need to conflict
Conflicts: vim-minimal < 2:8.2.1885-2 # remove when a new RHEL is released (current 8)
Conflicts: vim-minimal <= 2:8.2.2146-2
# vim bundles libvterm, which is used during build - so we need to provide # vim bundles libvterm, which is used during build - so we need to provide
# bundled libvterm for catching possible libvterm CVEs # bundled libvterm for catching possible libvterm CVEs
Provides: bundled(libvterm) Provides: bundled(libvterm)
@ -539,13 +541,16 @@ chmod 644 %{buildroot}/%{_datadir}/%{name}/%{vimdir}/doc/vim2html.pl \
chmod 644 ../runtime/doc/vim2html.pl chmod 644 ../runtime/doc/vim2html.pl
mkdir -p %{buildroot}/%{_sysconfdir}/profile.d mkdir -p %{buildroot}/%{_sysconfdir}/profile.d
install -p -m644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/profile.d/vi.sh
install -p -m644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/profile.d/vim.sh install -p -m644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/profile.d/vim.sh
install -p -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/profile.d/vi.csh
install -p -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/profile.d/vim.csh install -p -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/profile.d/vim.csh
install -p -m644 %{SOURCE16} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.sh install -p -m644 %{SOURCE16} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.sh
install -p -m644 %{SOURCE17} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.csh install -p -m644 %{SOURCE17} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.csh
mkdir -p %{buildroot}/%{_datadir}/fish/vendor_conf.d/ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_conf.d/
install -p -m644 %{SOURCE18} %{buildroot}/%{_datadir}/fish/vendor_conf.d/vim-default-editor.fish install -p -m644 %{SOURCE18} %{buildroot}/%{_datadir}/fish/vendor_conf.d/vim-default-editor.fish
mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/
install -p -m644 %{SOURCE19} %{buildroot}/%{_datadir}/fish/vendor_functions.d/vi.fish
install -p -m644 %{SOURCE19} %{buildroot}/%{_datadir}/fish/vendor_functions.d/vim.fish install -p -m644 %{SOURCE19} %{buildroot}/%{_datadir}/fish/vendor_functions.d/vim.fish
install -p -m644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/virc install -p -m644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/virc
install -p -m644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/vimrc install -p -m644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/vimrc
@ -746,8 +751,8 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
%files minimal %files minimal
%dir %{_datadir}/fish/vendor_functions.d %dir %{_datadir}/fish/vendor_functions.d
%ghost %{_datadir}/fish/vendor_functions.d/vim.fish %{_datadir}/fish/vendor_functions.d/vi.fish
%ghost %config(noreplace) %{_sysconfdir}/profile.d/vim.* %config(noreplace) %{_sysconfdir}/profile.d/vi.*
%config(noreplace) %{_sysconfdir}/virc %config(noreplace) %{_sysconfdir}/virc
%{_bindir}/ex %{_bindir}/ex
%{_bindir}/vi %{_bindir}/vi
@ -763,8 +768,8 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
%files enhanced %files enhanced
%dir %{_datadir}/fish/vendor_functions.d %dir %{_datadir}/fish/vendor_functions.d
%ghost %{_datadir}/fish/vendor_functions.d/vim.fish %{_datadir}/fish/vendor_functions.d/vim.fish
%ghost %config(noreplace) %{_sysconfdir}/profile.d/vim.* %config(noreplace) %{_sysconfdir}/profile.d/vim.*
%{_bindir}/vim %{_bindir}/vim
%{_bindir}/rvim %{_bindir}/rvim
%{_bindir}/vimdiff %{_bindir}/vimdiff
@ -824,6 +829,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
%config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.*
%changelog %changelog
* Fri Dec 18 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2146-2
- install vim-minimal profiles under different name to avoid future conflicts
* Wed Dec 16 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2146-1 * Wed Dec 16 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2146-1
- patchlevel 2146 - patchlevel 2146