From 76f181b778115cfa8548f32ca2303b13f0fc32461c347a4075398ced01a3a9b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Tue, 21 Mar 2023 11:40:36 +0000 Subject: [PATCH 1/9] - Updated to version 9.0.1418, fixes the following problems - fixes CVE-2023-1355 * Using NULL pointer with nested :open command. * Cairo files are not recognized. * Unx Tal files are not recognized. * Odin files are not recognized. * sort(list, 'N') does not work in Vim9 script context. * Highlight for popupmenu kind and extra cannot be set. * Profile test repeats the headers many times. * Highlight test script has a few problems. * find_file_in_path() is not reentrant. * Condition is always true. * Crash when using null_class. * Unused variables and functions. * Compilation error with some compilers. * Missing check for out-of-memory. * ILE RPG files are not recognized. * TableGen files are not recognized. * QMLdir files are not recognized. * Racket files are recognized as scheme. * Accuracy of profiling is not optimal. * Pony files are not recognized. * Compiler warning for unused variable. * in Kitty does not use the Shift modifier. * Crystal files are not recognized. * Crash when collection is modified when using filter(). * ESDL files are not recognized. * The included xdiff code is a bit outdated. OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=796 --- vim-9.0.1392.tar.gz | 3 --- vim-9.0.1418.tar.gz | 3 +++ vim.changes | 32 ++++++++++++++++++++++++++++++++ vim.spec | 2 +- 4 files changed, 36 insertions(+), 4 deletions(-) delete mode 100644 vim-9.0.1392.tar.gz create mode 100644 vim-9.0.1418.tar.gz diff --git a/vim-9.0.1392.tar.gz b/vim-9.0.1392.tar.gz deleted file mode 100644 index 7024669..0000000 --- a/vim-9.0.1392.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca08fe6cac14d3cb37e6f1780e86e43ae83b9deacef81b102dfdecc697e584f2 -size 16975039 diff --git a/vim-9.0.1418.tar.gz b/vim-9.0.1418.tar.gz new file mode 100644 index 0000000..0946bdb --- /dev/null +++ b/vim-9.0.1418.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:089dc02e1017605f00390d5a4b336043a200d4a14dfb7c0f68fd49586562e8f9 +size 16978563 diff --git a/vim.changes b/vim.changes index 8ad4c19..cf3defb 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Tue Mar 21 11:38:46 UTC 2023 - Ondřej Súkup + +- Updated to version 9.0.1418, fixes the following problems +- fixes CVE-2023-1355 + * Using NULL pointer with nested :open command. + * Cairo files are not recognized. + * Unx Tal files are not recognized. + * Odin files are not recognized. + * sort(list, 'N') does not work in Vim9 script context. + * Highlight for popupmenu kind and extra cannot be set. + * Profile test repeats the headers many times. + * Highlight test script has a few problems. + * find_file_in_path() is not reentrant. + * Condition is always true. + * Crash when using null_class. + * Unused variables and functions. + * Compilation error with some compilers. + * Missing check for out-of-memory. + * ILE RPG files are not recognized. + * TableGen files are not recognized. + * QMLdir files are not recognized. + * Racket files are recognized as scheme. + * Accuracy of profiling is not optimal. + * Pony files are not recognized. + * Compiler warning for unused variable. + * in Kitty does not use the Shift modifier. + * Crystal files are not recognized. + * Crash when collection is modified when using filter(). + * ESDL files are not recognized. + * The included xdiff code is a bit outdated. + ------------------------------------------------------------------- Mon Mar 13 15:15:13 UTC 2023 - Bjørn Lie diff --git a/vim.spec b/vim.spec index 341a12f..d6c6703 100644 --- a/vim.spec +++ b/vim.spec @@ -17,7 +17,7 @@ %define pkg_version 9.0 -%define patchlevel 1392 +%define patchlevel 1418 %define patchlevel_compact %{patchlevel} %define VIM_SUBDIR vim90 %define site_runtimepath %{_datadir}/vim/site From 7b306c3ac08076051805fa33467763c1275b3389a863712267c0ce7b96388a0c Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 29 Mar 2023 10:25:06 +0000 Subject: [PATCH 2/9] Accepting request 1075150 from home:gladiac:branches:editors - Create a standalone package for xxd * This is used by non-vim tools too OBS-URL: https://build.opensuse.org/request/show/1075150 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=797 --- vim.changes | 6 ++++++ vim.spec | 31 +++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/vim.changes b/vim.changes index cf3defb..af581f0 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 28 08:48:31 UTC 2023 - Andreas Schneider + +- Create a standalone package for xxd + * This is used by non-vim tools too + ------------------------------------------------------------------- Tue Mar 21 11:38:46 UTC 2023 - Ondřej Súkup diff --git a/vim.spec b/vim.spec index d6c6703..9f25753 100644 --- a/vim.spec +++ b/vim.spec @@ -96,6 +96,7 @@ BuildRequires: pkgconfig(lua) BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(xt) Requires: vim-data-common = %{version}-%{release} +Requires: xxd = %{version}-%{release} %if %{with libalternatives} Requires: alts %else @@ -193,6 +194,13 @@ Requires: vim-data-common = %{version}-%{release} Vim compiled with reduced feature set such as no script interpreters built in +%package -n xxd +Summary: A hex dump utility + +%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} @@ -587,9 +595,23 @@ fi %{_bindir}/vitmp %{_bindir}/vimtutor %{_bindir}/gvimtutor -%{_bindir}/xxd # man pages -%{_mandir}/man1/* +%{_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/* @@ -782,4 +804,9 @@ fi %{_bindir}/vim %{_bindir}/vim-small +%files -n xxd +%license LICENSE +%{_bindir}/xxd +%{_mandir}/man1/xxd.1%{ext_man} + %changelog From 37135866b8be969ef56ca15daee79ad264329d11807e58251e04a981a9f1d880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Wed, 29 Mar 2023 14:26:35 +0000 Subject: [PATCH 3/9] Fix OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=798 --- vim.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vim.spec b/vim.spec index 9f25753..ae3c352 100644 --- a/vim.spec +++ b/vim.spec @@ -154,6 +154,7 @@ Summary: A GUI for Vi Group: Productivity/Text/Editors Requires: gvim_client Requires: vim-data = %{version}-%{release} +Requires: xxd = %{version}-%{release} %if %{with libalternatives} BuildRequires: alts Requires: alts @@ -189,6 +190,7 @@ Requires(postun):update-alternatives Provides: vi Provides: vim_client Requires: vim-data-common = %{version}-%{release} +Requires: xxd = %{version}-%{release} %description small Vim compiled with reduced feature set such as no script From aae0a38d160fd337e9d35c2b94b7c4a243ccc35cead0dc19c20144fca74d0313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Wed, 29 Mar 2023 14:29:58 +0000 Subject: [PATCH 4/9] rm xxd from small OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=799 --- vim.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/vim.spec b/vim.spec index ae3c352..26f272d 100644 --- a/vim.spec +++ b/vim.spec @@ -190,7 +190,6 @@ Requires(postun):update-alternatives Provides: vi Provides: vim_client Requires: vim-data-common = %{version}-%{release} -Requires: xxd = %{version}-%{release} %description small Vim compiled with reduced feature set such as no script From b51c15ebe37906b7e5f60b1b5701698db6e1d3c3b7dae04e3b78ba68c35e6af2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Thu, 30 Mar 2023 16:25:48 +0000 Subject: [PATCH 5/9] - 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. OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=800 --- vim-9.0.1418.tar.gz | 3 -- vim-9.0.1430.tar.gz | 3 ++ vim.changes | 18 +++++++ vim.spec | 117 ++++++++++++++++++++++++-------------------- 4 files changed, 84 insertions(+), 57 deletions(-) delete mode 100644 vim-9.0.1418.tar.gz create mode 100644 vim-9.0.1430.tar.gz 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 From ab376b77ac27ae2a14ea65c96acf01368ec57ffdd4ae334b694e10728c9de74a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Thu, 30 Mar 2023 16:44:48 +0000 Subject: [PATCH 6/9] fix? OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=801 --- vim.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vim.spec b/vim.spec index 835b045..59de528 100644 --- a/vim.spec +++ b/vim.spec @@ -252,6 +252,9 @@ rm src/testdir/test_textprop.* rm src/testdir/test_window_cmd.* rm src/testdir/test_writefile.* rm runtime/indent/testdir/vim.* +%ifarch %{ix86} +rm /src/testdir/test_python3.vim +%endif %build export CFLAGS="%{optflags} -Wall -pipe -fno-strict-aliasing" From 7662dcdcee9c5706b7413ed3097a85c69813e7440dea9d8170f73994abaad2bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Thu, 30 Mar 2023 16:45:16 +0000 Subject: [PATCH 7/9] fxxx OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=802 --- vim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 59de528..ba66801 100644 --- a/vim.spec +++ b/vim.spec @@ -253,7 +253,7 @@ rm src/testdir/test_window_cmd.* rm src/testdir/test_writefile.* rm runtime/indent/testdir/vim.* %ifarch %{ix86} -rm /src/testdir/test_python3.vim +rm /src/testdir/test_python3.* %endif %build From 516e555249147399459f234998c9b0427d8cee0973fe21388dc7e632c595ce1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Thu, 30 Mar 2023 16:53:34 +0000 Subject: [PATCH 8/9] fix OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=803 --- vim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index ba66801..a7f9fed 100644 --- a/vim.spec +++ b/vim.spec @@ -253,7 +253,7 @@ rm src/testdir/test_window_cmd.* rm src/testdir/test_writefile.* rm runtime/indent/testdir/vim.* %ifarch %{ix86} -rm /src/testdir/test_python3.* +rm src/testdir/test_python3.* %endif %build From cadd5825d9c7f00fa3d995bb712664ae0ea260a611b8285867bfc5f7c07d28a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Thu, 30 Mar 2023 17:20:35 +0000 Subject: [PATCH 9/9] fix OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=804 --- vim.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vim.spec b/vim.spec index a7f9fed..066a793 100644 --- a/vim.spec +++ b/vim.spec @@ -252,9 +252,6 @@ rm src/testdir/test_textprop.* rm src/testdir/test_window_cmd.* rm src/testdir/test_writefile.* rm runtime/indent/testdir/vim.* -%ifarch %{ix86} -rm src/testdir/test_python3.* -%endif %build export CFLAGS="%{optflags} -Wall -pipe -fno-strict-aliasing" @@ -490,6 +487,7 @@ sed -i "s@%{_bindir}/env perl@%{_bindir}/perl@" %{buildroot}%{_datadir}/vim/%{VI sed -i "s@%{_bindir}/env perl@%{_bindir}/perl@" %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/doc/vim2html.pl %check +%ifnarch %{ix86} # vim does quite an extensive test relying on a full fledged terminal # inside OBS, stdio is redirected to a serial console (where the build log # is being recorded/extracted. Systemd set non-local tty by default to vt220 @@ -498,6 +496,7 @@ export TERM=xterm # Reset the terminal scrolling region left behind by the testsuite trap "printf '\e[r'" EXIT TEST_IGNORE_FLAKY=1 LC_ALL=en_US.UTF-8 make -j1 test +%endif %if %{with libalternatives} # with libalternatives