diff --git a/vim.spec b/vim.spec index 371727c..29954b7 100644 --- a/vim.spec +++ b/vim.spec @@ -50,7 +50,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 # the Apache-2.0 is Apache 2.0 with runtime library exception - reported to legal for adding to the list of allowed licenses, but swift-lang uses it as well # Open Publication License 1.0 or later - reported to legal for adding to the allowed licenses list @@ -169,6 +169,9 @@ Conflicts: %{name}-minimal < %{epoch}:8.2.3642-2 # shared files between common and minimal Requires: %{name}-data = %{epoch}:%{version}-%{release} Requires: %{name}-filesystem +# the hexdump binary was part of the package for long time, ship it with it +# still for convenience +Requires: xxd # vim-toml was a separate package but the runtime files have been included # directly in vim since 8.2.3519. The vim-toml package has been retired in # Fedora, obsolete it so it doesn't get left on users' systems. Added in F38, @@ -359,6 +362,17 @@ Requires: vim-enhanced This subpackage contains files needed to set Vim as the default editor. %endif +%package -n xxd +Summary: A hex dump utility +# the xxd related file were shipped in vim-common in the past, +# we have to conflict with the old ones +# remove this Conflicts once C10S is released +Conflicts: %{name}-common < 2:9.0.1440-2 + +%description -n xxd +xxd creates a hex dump of a given file or standard input. It can also convert +a hex dump back to its original binary form. + %prep %setup -q -b 0 -n %{vimdir} @@ -837,12 +851,10 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %lang(zh_TW) %{_datadir}/%{name}/%{vimdir}/lang/zh_TW %lang(zh_CN.UTF-8) %{_datadir}/%{name}/%{vimdir}/lang/zh_CN.UTF-8 %lang(zh_TW.UTF-8) %{_datadir}/%{name}/%{vimdir}/lang/zh_TW.UTF-8 -/%{_bindir}/xxd %{_mandir}/man1/rvim.* %{_mandir}/man1/vim.* %{_mandir}/man1/vimdiff.* %{_mandir}/man1/vimtutor.* -%{_mandir}/man1/xxd.* %{_mandir}/man5/vimrc.* %if %{with gui} @@ -1004,8 +1016,16 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* %endif +%files -n xxd +%license LICENSE +%{_bindir}/xxd +%{_mandir}/man1/xxd.* + %changelog +* Wed Apr 05 2023 Andreas Schneider - 2:9.0.1440-2 +- create xxd package, because it is used by hex.nvim + * Wed Apr 05 2023 Zdenek Dohnal - 2:9.0.1440-2 - list most licenses available in binary rpms and migrate them into SPDX syntax