Sync from SUSE:ALP:Source:Standard:1.0 vim revision 0479c397e0da37eb4c99e860c117b0fe

vim.spec

@@ -17,7 +17,7 @@
 
 
 %define pkg_version 9.1
-%define patchlevel 1176
+%define patchlevel 1629
 %define patchlevel_compact %{patchlevel}
 %define VIM_SUBDIR vim91
 %define site_runtimepath %{_datadir}/vim/site
@@ -33,6 +33,7 @@ Version:        %{pkg_version}.%{patchlevel_compact}
 Release:        0
 Summary:        Vi IMproved
 License:        Vim
+Group:          Productivity/Text/Editors
 URL:            https://www.vim.org/
 Source:         https://github.com/vim/vim/archive/v%{pkg_version}.%{patchlevel}.tar.gz#/vim-%{pkg_version}.%{patchlevel}.tar.gz
 Source3:        suse.vimrc
@@ -58,7 +59,6 @@ Source29:       gvim_96.png
 Source30:       gvim_128.png
 Source31:       gvim_256.png
 Source32:       gvim_512.png
-# /Section
 Source98:       vim-changelog.sh
 Source99:       %{name}-7.4-rpmlintrc
 Patch3:         %{name}-7.4-disable_lang_no.patch
@@ -74,7 +74,8 @@ Patch22:        %{name}-7.4-filetype_mine.patch
 Patch100:       %{name}73-no-static-libpython.patch
 Patch101:       %{name}-8.0.1568-defaults.patch
 Patch104:       %{name}-8.2.2411-globalvimrc.patch
-Patch105:       %{name}-9.1.1134-revert-putty-terminal-colors.patch
+Patch105:	reorder-exit-raw-mode.patch
+Patch106:       %{name}-9.1.1134-revert-putty-terminal-colors.patch
 BuildRequires:  autoconf
 BuildRequires:  db-devel
 BuildRequires:  fdupes
@@ -104,7 +105,6 @@ BuildRequires:  pkgconfig(tic)
 BuildRequires:  pkgconfig(tinfo)
 BuildRequires:  pkgconfig(xt)
 Requires:       vim-data-common = %{version}-%{release}
-Requires:       xxd = %{version}-%{release}
 Recommends:     vim-data = %{version}-%{release}
 Conflicts:      vim-base < 8.2
 Provides:       vi
@@ -114,6 +114,7 @@ Provides:       vim-python = %{version}-%{release}
 Obsoletes:      vim-base < %{version}-%{release}
 Obsoletes:      vim-enhanced < %{version}-%{release}
 Obsoletes:      vim-python < %{version}-%{release}
+Obsoletes:      xxd
 Provides:       vim_client
 %{?libperl_requires}
 %if %{with libalternatives}
@@ -135,6 +136,7 @@ file name completion, block operations, and editing of binary data.
 
 %package data
 Summary:        Data files needed for extended vim functionality
+Group:          Productivity/Text/Editors
 Requires:       vim-data-common = %{version}-%{release}
 # Used to be in vim-plugins package
 Obsoletes:      vim-plugin-matchit <= 1.13.2
@@ -149,6 +151,7 @@ This package contains optional runtime & syntax files for vim.
 
 %package data-common
 Summary:        Common Data files for vim & gvim
+Group:          Productivity/Text/Editors
 BuildArch:      noarch
 
 %description data-common
@@ -156,14 +159,15 @@ This package contains basic runtime & syntax files for vim
 
 %package -n gvim
 Summary:        A GUI for Vi
+Group:          Productivity/Text/Editors
 Requires:       gvim_client
 Requires:       vim-data = %{version}-%{release}
-Requires:       xxd = %{version}-%{release}
 Conflicts:      gvim < 8.2
 Provides:       gvim-base = %{version}-%{release}
 Provides:       gvim-enhanced = %{version}-%{release}
 Obsoletes:      gvim-base < %{version}-%{release}
 Obsoletes:      gvim-enhanced < %{version}-%{release}
+Obsoletes:      xxd
 Provides:       gvim_client
 Provides:       vi
 Provides:       vim_client
@@ -183,6 +187,7 @@ want less features, you might want to install vim instead.
 
 %package small
 Summary:        Vim with reduced features
+Group:          Productivity/Text/Editors
 Requires:       vim-data-common = %{version}-%{release}
 Provides:       vi
 Provides:       vim_client
@@ -198,32 +203,25 @@ Requires(postun):update-alternatives
 Vim compiled with reduced feature set such as no script
 interpreters built in
 
-%package -n xxd
-Summary:        A hex dump utility
-Conflicts:      vim <= 9.0.1418
-
-%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 -n %{name}-%{pkg_version}.%{patchlevel}
 
-%patch -P 3 -p1
-%patch -P 4 -p1
-%patch -P 6 -p1
-%patch -P 7 -p1
-%patch -P 9 -p1
-%patch -P 10 -p1
+%patch3 -p1
+%patch4 -p1
+%patch6 -p1
+%patch7 -p1
+%patch9 -p1
+%patch10 -p1
 cp %{SOURCE23} runtime/syntax/apparmor.vim
-%patch -P 15 -p1
-%patch -P 18 -p1
-%patch -P 21 -p1
-%patch -P 22 -p1
-%patch -P 100 -p1
-%patch -P 101 -p1
-%patch -P 104 -p1
-%patch -P 105 -p1
+%patch15 -p1
+%patch18 -p1
+%patch21 -p1
+%patch22 -p1
+%patch100 -p1
+%patch101 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} .
 
 %build
@@ -239,6 +237,7 @@ export COMMON_OPTIONS="\
     --with-compiledby='http://www.opensuse.org/' \
     --with-tlib=tinfo \
     --with-global-runtime=%{site_runtimepath} \
+    --with-wayland=no \
     "
 
 # yeah kind of weird to call this small when we then use the
@@ -463,6 +462,7 @@ mkdir -p %{buildroot}%{_localstatedir}/run/vi.recover
 sed -i "s@%{_bindir}/env perl@%{_bindir}/perl@" %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tools/*.pl
 sed -i "s@%{_bindir}/env perl@%{_bindir}/perl@" %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/doc/vim2html.pl
 
+
 %if %{with libalternatives}
 # with libalternatives
 %pre
@@ -571,6 +571,7 @@ fi
 %{_bindir}/vitmp
 %{_bindir}/vimtutor
 %{_bindir}/gvimtutor
+%{_bindir}/xxd
 # man pages
 %{_mandir}/man1/eview.1%{?ext_man}
 %{_mandir}/man1/evim.1%{?ext_man}
@@ -588,6 +589,7 @@ fi
 %{_mandir}/man1/vimdiff.1%{?ext_man}
 %{_mandir}/man1/vimtutor.1%{?ext_man}
 %{_mandir}/man1/vitmp.1%{?ext_man}
+%{_mandir}/man1/xxd.1%{?ext_man}
 %dir %{_mandir}/da
 %dir %{_mandir}/da/man1/
 %{_mandir}/da/man1/*.1%{?ext_man}
@@ -781,9 +783,4 @@ fi
 %{_bindir}/vim
 %{_bindir}/vim-small
 
-%files -n xxd
-%license LICENSE
-%{_bindir}/xxd
-%{_mandir}/man1/xxd.1%{?ext_man}
-
 %changelog