diff --git a/vim-9.0.1418.tar.gz b/vim-9.0.1418.tar.gz deleted file mode 100644 index 0946bdb..0000000 --- a/vim-9.0.1418.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:089dc02e1017605f00390d5a4b336043a200d4a14dfb7c0f68fd49586562e8f9 -size 16978563 diff --git a/vim-9.0.1430.tar.gz b/vim-9.0.1430.tar.gz new file mode 100644 index 0000000..d2185ae --- /dev/null +++ b/vim-9.0.1430.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ad53cee902c3311bf2028deffc3cdb25ad29b6716aa401bb1f193b2e9384792 +size 16979739 diff --git a/vim.changes b/vim.changes index af581f0..ea13021 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Mar 30 16:24:53 UTC 2023 - Ondřej Súkup + +- Updated to version 9.0.1430, fixes the following problems + * The included xdiff code is a bit outdated. + * Lean files are not recognized. + * Build failure because SIZE_MAX is not defined. + * Nu files are not recognized. + * Sage files are not recognized. + * WebAssembly Interface Type files are not recognized. + * Unused macros are defined. + * "wat" and "wast" files are one filetype. + * Indent wrong after "export namespace" in C++. + * Warning for uninitialized variable. (Tony Mechelynck) + * Cursor in wrong position when leaving insert mode. + * Invalid memory access when ending insert mode. + * Livebook files are not recognized. + ------------------------------------------------------------------- Tue Mar 28 08:48:31 UTC 2023 - Andreas Schneider diff --git a/vim.spec b/vim.spec index 26f272d..835b045 100644 --- a/vim.spec +++ b/vim.spec @@ -17,26 +17,24 @@ %define pkg_version 9.0 -%define patchlevel 1418 +%define patchlevel 1430 %define patchlevel_compact %{patchlevel} %define VIM_SUBDIR vim90 %define site_runtimepath %{_datadir}/vim/site %define make make VIMRCLOC=%{_sysconfdir} VIMRUNTIMEDIR=%{_datadir}/vim/current MAKE="make -e" %{?_smp_mflags} -%bcond_without python2 - %if 0%{?suse_version} > 1500 %bcond_without libalternatives %else %bcond_with libalternatives %endif - +%bcond_without python2 Name: vim Version: %{pkg_version}.%{patchlevel_compact} Release: 0 Summary: Vi IMproved License: Vim Group: Productivity/Text/Editors -URL: http://www.vim.org/ +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 Source4: vimrc_example1 @@ -83,26 +81,31 @@ BuildRequires: db-devel BuildRequires: fdupes BuildRequires: gettext-devel BuildRequires: gpm-devel -BuildRequires: libacl-devel BuildRequires: libtool -BuildRequires: ncurses-devel BuildRequires: perl BuildRequires: pkgconfig BuildRequires: ruby-devel BuildRequires: update-desktop-files +BuildRequires: pkgconfig(form) +BuildRequires: pkgconfig(formw) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(krb5) +BuildRequires: pkgconfig(libacl) BuildRequires: pkgconfig(lua) +BuildRequires: pkgconfig(menu) +BuildRequires: pkgconfig(menuw) +BuildRequires: pkgconfig(ncurses) +BuildRequires: pkgconfig(ncurses++) +BuildRequires: pkgconfig(ncurses++w) +BuildRequires: pkgconfig(ncursesw) +BuildRequires: pkgconfig(panel) +BuildRequires: pkgconfig(panelw) BuildRequires: pkgconfig(python3) +BuildRequires: pkgconfig(tic) +BuildRequires: pkgconfig(tinfo) BuildRequires: pkgconfig(xt) Requires: vim-data-common = %{version}-%{release} Requires: xxd = %{version}-%{release} -%if %{with libalternatives} -Requires: alts -%else -Requires(post): update-alternatives -Requires(postun):update-alternatives -%endif Recommends: vim-data = %{version}-%{release} Conflicts: vim-base < 8.2 Provides: vi @@ -114,6 +117,12 @@ Obsoletes: vim-enhanced < %{version}-%{release} Obsoletes: vim-python < %{version}-%{release} Provides: vim_client %{?libperl_requires} +%if %{with libalternatives} +Requires: alts +%else +Requires(post): update-alternatives +Requires(postun):update-alternatives +%endif %if %{with python2} BuildRequires: python2-devel %endif @@ -135,7 +144,6 @@ Provides: vim-plugin-matchit = 1.13.2 # conflicts with nginx own plugin Obsoletes: vim-plugin-nginx < %{version} Provides: vim-plugin-nginx = %{version} - BuildArch: noarch %description data @@ -155,13 +163,6 @@ Group: Productivity/Text/Editors Requires: gvim_client Requires: vim-data = %{version}-%{release} Requires: xxd = %{version}-%{release} -%if %{with libalternatives} -BuildRequires: alts -Requires: alts -%else -Requires(post): update-alternatives -Requires(postun):update-alternatives -%endif Conflicts: gvim < 8.2 Provides: gvim-base = %{version}-%{release} Provides: gvim-enhanced = %{version}-%{release} @@ -170,6 +171,13 @@ Obsoletes: gvim-enhanced < %{version}-%{release} Provides: gvim_client Provides: vi Provides: vim_client +%if %{with libalternatives} +BuildRequires: alts +Requires: alts +%else +Requires(post): update-alternatives +Requires(postun):update-alternatives +%endif %description -n gvim Package gvim contains the largest set of features of vim, which is @@ -180,6 +188,9 @@ 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 %if %{with libalternatives} BuildRequires: alts Requires: alts @@ -187,9 +198,6 @@ Requires: alts Requires(post): update-alternatives Requires(postun):update-alternatives %endif -Provides: vi -Provides: vim_client -Requires: vim-data-common = %{version}-%{release} %description small Vim compiled with reduced feature set such as no script @@ -300,21 +308,21 @@ popd # build smaller vim %configure ${SMALL_OPTIONS} ${NOGUI_OPTIONS} sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h -make %{?_smp_mflags} +%make_build cp src/vim vim-small # build normal vim -make -j1 distclean +%make_build -j1 distclean %configure ${HUGE_OPTIONS} ${NOGUI_OPTIONS} sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h -make %{?_smp_mflags} +%make_build cp src/vim vim-nox11 # build gvim -make -j1 distclean +%make_build -j1 distclean %configure ${HUGE_OPTIONS} ${GUI_OPTIONS} sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h -make %{?_smp_mflags} +%make_build # # build vitmp @@ -597,46 +605,47 @@ fi %{_bindir}/vimtutor %{_bindir}/gvimtutor # man pages -%{_mandir}/man1/eview.1%{ext_man} -%{_mandir}/man1/evim.1%{ext_man} -%{_mandir}/man1/ex.1%{ext_man} -%{_mandir}/man1/gview.1%{ext_man} -%{_mandir}/man1/gvim.1%{ext_man} -%{_mandir}/man1/gvimdiff.1%{ext_man} -%{_mandir}/man1/rgview.1%{ext_man} -%{_mandir}/man1/rgvim.1%{ext_man} -%{_mandir}/man1/rview.1%{ext_man} -%{_mandir}/man1/rvim.1%{ext_man} -%{_mandir}/man1/vi.1%{ext_man} -%{_mandir}/man1/view.1%{ext_man} -%{_mandir}/man1/vim.1%{ext_man} -%{_mandir}/man1/vimdiff.1%{ext_man} -%{_mandir}/man1/vimtutor.1%{ext_man} -%{_mandir}/man1/vitmp.1%{ext_man} +%{_mandir}/man1/eview.1%{?ext_man} +%{_mandir}/man1/evim.1%{?ext_man} +%{_mandir}/man1/ex.1%{?ext_man} +%{_mandir}/man1/gview.1%{?ext_man} +%{_mandir}/man1/gvim.1%{?ext_man} +%{_mandir}/man1/gvimdiff.1%{?ext_man} +%{_mandir}/man1/rgview.1%{?ext_man} +%{_mandir}/man1/rgvim.1%{?ext_man} +%{_mandir}/man1/rview.1%{?ext_man} +%{_mandir}/man1/rvim.1%{?ext_man} +%{_mandir}/man1/vi.1%{?ext_man} +%{_mandir}/man1/view.1%{?ext_man} +%{_mandir}/man1/vim.1%{?ext_man} +%{_mandir}/man1/vimdiff.1%{?ext_man} +%{_mandir}/man1/vimtutor.1%{?ext_man} +%{_mandir}/man1/vitmp.1%{?ext_man} %dir %{_mandir}/da %dir %{_mandir}/da/man1/ -%{_mandir}/da/man1/* +%{_mandir}/da/man1/*.1%{?ext_man} %dir %{_mandir}/de %dir %{_mandir}/de/man1/ -%{_mandir}/de/man1/* +%{_mandir}/de/man1/*.1%{?ext_man} %dir %{_mandir}/fr %dir %{_mandir}/fr/man1/ -%{_mandir}/fr/man1/* +%{_mandir}/fr/man1/*.1%{?ext_man} %dir %{_mandir}/it %dir %{_mandir}/it/man1/ -%{_mandir}/it/man1/* +%{_mandir}/it/man1/*.1%{?ext_man} %dir %{_mandir}/ru %dir %{_mandir}/ru/man1/ -%{_mandir}/ru/man1/* +%{_mandir}/ru/man1/*.1%{?ext_man} %dir %{_mandir}/pl %dir %{_mandir}/pl/man1/ -%{_mandir}/pl/man1/* +%{_mandir}/pl/man1/*.1%{?ext_man} %dir %{_mandir}/ja %dir %{_mandir}/ja/man1/ -%{_mandir}/ja/man1/* +%{_mandir}/ja/man1/*.1%{?ext_man} %dir %{_mandir}/tr %dir %{_mandir}/tr/man1/ -%{_mandir}/tr/man1/* +%{_mandir}/tr/man1/*.1%{?ext_man} + # docs and data file %license LICENSE %doc %{_docdir}/vim @@ -808,6 +817,6 @@ fi %files -n xxd %license LICENSE %{_bindir}/xxd -%{_mandir}/man1/xxd.1%{ext_man} +%{_mandir}/man1/xxd.1%{?ext_man} %changelog