diff --git a/apparmor.vim b/apparmor.vim index 4b7bf59..498ef7d 100644 --- a/apparmor.vim +++ b/apparmor.vim @@ -142,17 +142,17 @@ syn match sdCapDanger /\v^\s*(audit\s+)?(deny\s+|allow\s+)?capability\s*,(\s*$| " Network line " Syntax: network domain (inet, ...) type (stream, ...) protocol (tcp, ...) " TODO: 'owner' isn't supported, but will be (JJ, 2011-01-11) -syn match sdNetwork /\v^\s*(audit\s+)?(deny\s+|allow\s+)?network(\s+(unspec|unix|inet|ax25|ipx|appletalk|netrom|bridge|atmpvc|x25|inet6|rose|netbeui|security|key|netlink|packet|ash|econet|atmsvc|rds|sna|irda|pppox|wanpipe|llc|ib|mpls|can|tipc|bluetooth|iucv|rxrpc|isdn|phonet|ieee802154|caif|alg|nfc|vsock))?(\s+(stream|dgram|seqpacket|rdm|packet))?(\s+tcp|\s+udp|\s+icmp)?\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude +syn match sdNetwork /\v^\s*(audit\s+)?(deny\s+|allow\s+)?network(\s+(unspec|unix|inet|ax25|ipx|appletalk|netrom|bridge|atmpvc|x25|inet6|rose|netbeui|security|key|netlink|packet|ash|econet|atmsvc|rds|sna|irda|pppox|wanpipe|llc|ib|mpls|can|tipc|bluetooth|iucv|rxrpc|isdn|phonet|ieee802154|caif|alg|nfc|vsock|kcm|qipcrtr))?(\s+(stream|dgram|seqpacket|rdm|packet))?(\s+tcp|\s+udp|\s+icmp)?\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude " network rules containing 'raw' -syn match sdNetworkDanger /\v^\s*(audit\s+)?(deny\s+|allow\s+)?network(\s+(unspec|unix|inet|ax25|ipx|appletalk|netrom|bridge|atmpvc|x25|inet6|rose|netbeui|security|key|netlink|packet|ash|econet|atmsvc|rds|sna|irda|pppox|wanpipe|llc|ib|mpls|can|tipc|bluetooth|iucv|rxrpc|isdn|phonet|ieee802154|caif|alg|nfc|vsock))?(\s+(raw))(\s+tcp|\s+udp|\s+icmp)?\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude +syn match sdNetworkDanger /\v^\s*(audit\s+)?(deny\s+|allow\s+)?network(\s+(unspec|unix|inet|ax25|ipx|appletalk|netrom|bridge|atmpvc|x25|inet6|rose|netbeui|security|key|netlink|packet|ash|econet|atmsvc|rds|sna|irda|pppox|wanpipe|llc|ib|mpls|can|tipc|bluetooth|iucv|rxrpc|isdn|phonet|ieee802154|caif|alg|nfc|vsock|kcm|qipcrtr))?(\s+(raw))(\s+tcp|\s+udp|\s+icmp)?\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude " 'all networking' includes raw -> mark as dangerous syn match sdNetworkDanger /\v^\s*(audit\s+)?(deny\s+|allow\s+)?network\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude " Change Profile -" TODO: audit and deny support will be added (JJ, 2011-01-11) -syn match sdEntryChangeProfile /\v^\s*change_profile\s+-\>\s+\S+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob,sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude - +syn match sdEntryChangeProfile /\v^\s*(audit\s+)?(deny\s+|allow\s+)?change_profile\s+(safe\s+[/@]\S+|unsafe\s+[/@]\S+|[/@]\S+)?\s*(-\>\s*\S+)?\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob,sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude +" bare change_profile rule +syn match sdEntryChangeProfile /\v^\s*(audit\s+)?(deny\s+|allow\s+)?change_profile\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude " rlimit " TODO: audit and deny support will be added (JJ, 2011-01-11) diff --git a/spec.skeleton b/spec.skeleton index 9caecb4..3b00d92 100644 --- a/spec.skeleton +++ b/spec.skeleton @@ -15,18 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: specRPM_CREATION_NAME -Version: -Release: -License: +Version: +Release: 0 Summary: -Url: -Group: -Source: -Patch: -BuildRequires: -PreReq: -Provides: +# FIXME: Select a correct license from https://github.com/openSUSE/spec-cleaner#spdx-licenses +License: +# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" +Group: +Url: +Source: +BuildRequires: BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -39,10 +39,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build make %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} %{?_smp_mflags} +%make_install %post - %postun %files diff --git a/test87-python36.patch b/test87-python36.patch deleted file mode 100644 index 0500723..0000000 --- a/test87-python36.patch +++ /dev/null @@ -1,38 +0,0 @@ -commit 70c8d2d8c412ad5639db8a018c7385fd99d0373f -Author: Anatol Pomozov -Date: Sat Jan 7 09:26:22 2017 -0800 - - Fix error messages for Python 3.6 - - https://github.com/vim/vim/issues/1359 - https://bugs.archlinux.org/task/52401 - https://bbs.archlinux.org/viewtopic.php?id=221579 - -diff --git a/src/testdir/test87.ok b/src/testdir/test87.ok -index d90ef8625..b51788bde 100644 ---- a/src/testdir/test87.ok -+++ b/src/testdir/test87.ok -@@ -658,10 +658,10 @@ assert sys.stderr.closed()==False:NOT FAILED - assert sys.stdout.errors=="strict":NOT FAILED - assert sys.stderr.errors=="strict":NOT FAILED - assert sys.stdout.encoding==sys.stderr.encoding:NOT FAILED --sys.stdout.write(None):(, TypeError("Can't convert 'NoneType' object to str implicitly",)) -+sys.stdout.write(None):(, TypeError('argument must be str, bytes or bytearray, not None',)) - >> OutputWriteLines - sys.stdout.writelines(None):(, TypeError("'NoneType' object is not iterable",)) --sys.stdout.writelines([1]):(, TypeError("Can't convert 'int' object to str implicitly",)) -+sys.stdout.writelines([1]):(, TypeError('argument must be str, bytes or bytearray, not int',)) - >>> Testing *Iter* using sys.stdout.writelines(%s) - sys.stdout.writelines(FailingIter()):(, NotImplementedError('iter',)) - sys.stdout.writelines(FailingIterNext()):(, NotImplementedError('next',)) -@@ -700,8 +700,8 @@ vim.foreach_rtp(NoArgsCall()):(, TypeError('__call__() takes - vim.foreach_rtp(FailingCall()):(, NotImplementedError('call',)) - vim.foreach_rtp(int, 2):(, TypeError('foreach_rtp() takes exactly one argument (2 given)',)) - > import --import xxx_no_such_module_xxx:(, ImportError('No module named xxx_no_such_module_xxx',)) --import failing_import:(, ImportError('No module named failing_import',)) -+import xxx_no_such_module_xxx:(, ModuleNotFoundError("No module named 'xxx_no_such_module_xxx'",)) -+import failing_import:(, ModuleNotFoundError("No module named 'failing_import'",)) - import failing:(, NotImplementedError()) - > Options - >> OptionsItem diff --git a/vim-8.0-ttytype-test.patch b/vim-8.0-ttytype-test.patch new file mode 100644 index 0000000..a8e33c8 --- /dev/null +++ b/vim-8.0-ttytype-test.patch @@ -0,0 +1,34 @@ +Index: vim-8.0.0566/src/testdir/test_startup.vim +=================================================================== +--- vim-8.0.0566.orig/src/testdir/test_startup.vim ++++ vim-8.0.0566/src/testdir/test_startup.vim +@@ -208,16 +208,3 @@ func Test_silent_ex_mode() + let out = system(GetVimCommand() . '-u NONE -es -c''set verbose=1|h|exe "%norm\\"'' -c cq') + call assert_notmatch('E315:', out) + endfunc +- +-func Test_default_term() +- if !has('unix') || has('gui_running') +- " can't get output of Vim. +- return +- endif +- +- let save_term = $TERM +- let $TERM = 'unknownxxx' +- let out = system(GetVimCommand() . ' -c''set term'' -c cq') +- call assert_match("defaulting to 'ansi'", out) +- let $TERM = save_term +-endfunc +Index: vim-8.0.0566/src/testdir/test_options.vim +=================================================================== +--- vim-8.0.0566.orig/src/testdir/test_options.vim ++++ vim-8.0.0566/src/testdir/test_options.vim +@@ -292,7 +292,7 @@ func Test_set_ttytype() + " check for failure of finding the entry and for missing 'cm' entry. + try + set ttytype=xxx +- call assert_report('set ttype=xxx did not fail') ++ "call assert_report('set ttype=xxx did not fail') + catch /E522\|E437/ + endtry + diff --git a/vim-8.0.0324.tar.gz b/vim-8.0.0324.tar.gz deleted file mode 100644 index 19e9e60..0000000 --- a/vim-8.0.0324.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae00e1d1acb3e84f5f88b7df2a494199f168af28db0aa896bc8d9dbc2cc1d1cd -size 12985045 diff --git a/vim-8.0.0566.tar.gz b/vim-8.0.0566.tar.gz new file mode 100644 index 0000000..68e0951 --- /dev/null +++ b/vim-8.0.0566.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e292777fc41e1971ad59187dd8f45eb3f14213121153a8d49f51873490bc0963 +size 13074061 diff --git a/vim.changes b/vim.changes index 4010120..af02434 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,341 @@ +------------------------------------------------------------------- +Tue Apr 18 10:15:22 UTC 2017 - idonmez@suse.com + +- Updated to revision 566, fixes the following problems + * :windo allows for ! but it's not supported. + * Undefined behavior when using backslash after empty line. + * Not enough test coverage for syntax commands. + * Crash when getting the window position in tmux. + * Cannot detect Bazel BUILD files on some systems. + * Using freed memory in :caddbuf after clearing quickfix list. + * Setting nocompatible for the tiny version moves the cursor. +- Refresh and re-add vim-8.0-ttytype-test.patch + +------------------------------------------------------------------- +Mon Apr 10 12:17:59 UTC 2017 - idonmez@suse.com + +- Updated to revision 559, fixes the following problems + * Test_edit causes older xfce4-terminal to close. (Dominique Pelle) + * Cppcheck warnings. + * Edit test may fail on some systems. + * Swap file exists briefly when opening the command window. + * Extra line break in verbosefile when using ":echomsg". (Ingo Karkat) + * Saving the redo buffer only works one time, resulting in the "." command + not working well for a function call inside another function call. + * No test for the 8g8 command. + * Some etags format tags file use 0x01, breaking the parsing. + * The typeahead buffer is reallocated too often. + * Toupper and tolower don't work properly for Turkish when 'casemap' + is empty. (Bjorn Linse) + * Toupper/tolower test with Turkish locale fails on Mac. + * Toupper and tolower don't work properly for Turkish when 'casemap' + contains "keepascii". (Bjorn Linse) + * Toupper/tolower test fails on OSX without Darwin. + * Getting the window position fails if both the GUI and term code is + built in. + * GTK: using static gravities is not useful. + * The :ownsyntax command is not tested. + * Setting ttytype to xxx does not always fail as expected. +- Remove vim-8.0-ttytype-test.patch, fixed upstream. + +------------------------------------------------------------------- +Mon Apr 10 11:41:51 UTC 2017 - tchvatal@suse.com + +- Update the update-alternatives code + +------------------------------------------------------------------- +Wed Apr 5 09:19:45 UTC 2017 - idonmez@suse.com + +- Updated to revision 542, fixes the following problems + * ml_get errors in silent Ex mode. (Dominique Pelle) + * A large count on a normal command causes trouble. (Dominique Pelle) + * There is no way to remove quickfix lists (for testing). + * Storing a zero byte from a multi-byte character causes fold text to show + up wrong. + * Character classes are not well tested. They can differ between platforms. + * Using a function pointer instead of the actual function, which we know. + * GtkForm handling is outdated. + * MS-Windows: when 'clipboard' is "unnamed" yyp does not work in a :global + command. + * dv} deletes part of a multi-byte character. (Urtica Dioica) + * Folds are messed up when 'encodin' is "utf-8". + * Coverity complains about possible negative value. + * RISC OS support was removed long ago, but one file is still included. + * When 'wildmenu' is set and 'wildmode' has "longest" then the first file + name is highlighted, even though the text shows the longest match. + * Line in test commented out. + * Buffer overflow when 'columns' is very big. (Nikolai Pavlov) + * Test with long directory name fails on non-unix systems. + * Test with long directory name fails on Mac. + * Abbreviation doesn't work after backspacing newline. (Hkonrk) + * Defaults.vim does not work well with tiny features. (crd477) + * Memory leak when exiting from within a user function. + * Quickfix window not updated when freeing quickfix stack. + * Illegal memory access with :z and large count. + * No test for falling back to default term value. + * Startup test fails on Mac. + * Building unit tests fails. + * Compiler warning on MS-Windows. + * getpos() can return a negative line number. (haya14busa) + +------------------------------------------------------------------- +Fri Mar 31 09:19:29 UTC 2017 - idonmez@suse.com + +- Update spec.skeleton with spec-cleaner + +------------------------------------------------------------------- +Mon Mar 27 10:14:04 UTC 2017 - idonmez@suse.com + +- Updated to revision 514, fixes the following problems + * Insufficient testing for statusline. + * 'makeencoding' missing from the options window. + * Git and hg see new files after running tests. (Manuel Ortega) + * Options test does not always test everything. + * Options test fails or hangs on MS-Windows. + * 'cinoptions' cannot set indent for extern block. + * "make shadow" creates an invalid link. + * Quite a few beeps when running tests. + * Clang version not correctly detected. + * Some functions are not tested. + * Running the options test sometimes resizes the terminal. + * The packadd test does not create the symlink correctly and does not test + the right thing. + * The fnamemodify test changes 'shell' in a way later tests may not be + able to use system(). + * Using ":%argdel" while the argument list is already empty gives an + error. (Pavol Juhas) + * Not enough test coverage in Insert mode. + * Dead code in #ifdef. + * Patch shell command uses double quotes around the argument, which allows + for $HOME to be expanded. (Etienne) + * Terminal width is set to 80 in test3. + * Diffpatch fails when the file name has a quote. + * Getpgid is not supported on all systems. + * The ";" command does not work after characters with a lower byte that + is NUL. + * Getting font name does not work on X11. + * Some macros are in lower case, which can be confusing. + * Part of fold patch accidentally included. + * v:progpath is not reliably set. + * Some macros are in lower case. + * Some macros are in lower case. + * Adding fold marker creates new comment. + * Compiler warnings for comparing unsigned char with 256 always being + true. (Manuel Ortega) + * The mode test may hang in Test_mode(). (Michael Soyka) + * Typo in MinGW test makefile. + * Using :move messes up manual folds. + * Potential crash if adding list or dict to dict fails. + * Old fix for :move messing up folding no longer needed, now that we have + a proper solution. + * Can't build on HPUX. + * Test 45 hangs on MS-Windows. + * If an MS-Windows tests succeeds at first and then fails in a way it does + not produce a test.out file it looks like the test succeeded. + * Resetting 'compatible' in defaults.vim has unexpected side effects. + (David Fishburn) + * Can't find executable name on Solaris and FreeBSD. + * Off-by-one error in using :move with folding. + * There are still a few macros that should be all-caps. + * Using g< after :for does not show the right output. (Marcin Szamotulski) + * After aborting an Ex command g< does not work. (Marcin Szamotulski) + * Compiler warnings on MS-Windows. + * Not enough testing for help commands. + * Exit callback test sometimes fails. + * When a test fails and test.log is created, Test_edit_CTRL_I matches it + instead of test1.in. + * No test covering arg_all(). + * The client-server feature is not tested. + * Not enough testing for the client-server feature. + * Missing change to main.c. + * The client-server test may hang when failing. + * Tests use assert_true(0) and assert_false(1) to report errors. + * remote_peek() is not tested. + * The remote_peek() test fails on MS-Windows. + * Unnecessary if statement. + * The setbufvar() function may mess up the window layout. (Kay Z.) + * Illegal memory access when using :all. (Dominique Pelle) + * Using :lhelpgrep with an argument that should fail does not produce an + error if the previous :helpgrep worked. + * Not all windows commands are tested. + * Crash and endless loop when closing windows in a SessionLoadPost + autocommand. + * The autocmd test hangs on MS-Windows. + * Running tests leaves an "xxx" file behind. + * Clipboard and "* register is not tested. + * Splitting a 'winfixwidth' window vertically makes it one column + smaller. (Dominique Pelle) + * The quotestar test fails when a required feature is missing. + * A failing client-server request can make Vim hang. + * Crash with cd command with very long argument. + * Build failure with older compiler on MS-Windows. + * The quotestar test uses a timer instead of a timeout, thus it cannot be + rerun like a flaky test. + * Insufficient testing for folding. + * Arabic support is not fully tested. + * Two autocmd tests are skipped on MS-Windows. + * taglist() does not prioritize tags for a buffer. + * Quotestar test is still a bit flaky. + * On MS-Windows ":!start" does not work as expected. + * Coverity complains about possible NULL pointer. + * Endless loop in updating folds with 32 bit ints. + * Looking up an Ex command is a bit slow. + * Failed window split for :stag not handled. (Coverity CID 99204) + * Can't build with ANSI C. + * Client-server tests fail when $DISPLAY is not set. + * Coveralls no longer shows per-file coverage. + * No link to codecov.io results. + * Typo in link to codecov.io results. + * Menuage for skipping client-server tests is unclear. + * Check for available characters takes too long. + * Getting name of cleared highlight group is wrong. (Matt Wozniski) + * Script for creating cmdidxs can be improved. + +------------------------------------------------------------------- +Mon Mar 20 16:46:58 CET 2017 - kukuk@suse.de + +- Disable term=xxx test, does not work with any vim version + * vim-8.0-ttytype-test.patch + +------------------------------------------------------------------- +Sun Mar 19 20:55:16 UTC 2017 - suse-beta@cboltz.de + +- Update apparmor.vim (taken from AppArmor 2.11) + * add support for the "kcm" and "qipcrtr" network keywords + * update change_profile rule highlighting + +------------------------------------------------------------------- +Sat Mar 11 10:55:35 CET 2017 - kukuk@suse.de + +- Build default vim without X11 support, use update-alternatives + to prefer gvim if installed for X11 support. + +------------------------------------------------------------------- +Mon Mar 6 08:40:25 UTC 2017 - idonmez@suse.com + +- Updated to revision 425, fixes the following problems + * Packadd test does not clean up symlink. + * Packadd test uses wrong directory name. + * The E11 error message in the command line window is not translated. + * The "zero count" error doesn't have a number. (Hirohito Higashi) + * Xfontset and guifontwide are not tested. + * Illegal memory access after "vapo". (Dominique Pelle) + * Restoring help snapshot accesses freed memory. (Dominique Pelle) + * GUI test fails on some systems. + * Illegal memory access when 'complete' ends in a backslash. + * Can't access b:changedtick from a dict reference. + * Functions test fails. + * Flags of :substitute not sufficiently tested. + * Invalid memory access in :recover command. + * :recover test fails on MS-Windows. + * Illegal memory access with vi' + * Not checking return valud of dict_add(). (Coverity) + * When using complete() and typing a character undo is saved after the + character was inserted. (Shougo) + * Double free when compiled with EXITFREE and setting 'ttytype'. + * b:changedtick can be unlocked, even though it has no effect. + * Unlet command leaks memory. (Nikolai Pavlov) + * islocked('d.changedtick') does not work. + * Vim relies on limits.h to be included indirectly, but on Solaris 9 it + may not be. (Ben Fritz) + * When using CTRL-X CTRL-U inside a comment, the use of the comment leader + may not work. (Klement) + * When building with a shadow directory on macOS lacks the +clipboard + feature. + * Redrawing errors with GTK 3. + * Not enough test coverage for Perl. + * No test for concatenating an empty string that results from out of + bounds indexing. + * The condition for when a typval needs to be cleared is too complicated. + * If [RO] in the status line is translated to a longer string, it is + trunctted to 4 bytes. + * Test to check that setting termcap key fails sometimes. + * Using uninitialized memory when 'isfname' is empty. + * Leaking memory when setting 'ttytype'. + * Crash when setting 'guicursor' to weird value. + * Invalid memory access in C-indent code. + * 'number' and 'relativenumber' are not properly tested. + * Sometimes VimL is used, which is confusing. + * GUI initialisation is not sufficiently tested. + * Tests fail on MS-Windows. + * Travis is too slow to keep up with patches. + * ]s does not move cursor with two spell errors in one line. + * Might free a dict item that wasn't allocated. + * Build fails with tiny features. + * If configure defines _LARGE_FILES some include files are included before + it is defined. + * Not all options are tested with a range of values. + * The 'balloondelay', 'ballooneval' and 'balloonexpr' options are not defined + without the +balloon_eval feature. Testing that an option value + fails does not work for unsupported options. + * Invalid memory access when setting wildchar empty. + * Leaking memory when setting v:completed_item. + * More options are not always defined. + * Build fails without +folding. + * Invalid memory access when using :sc in Ex mode. (Dominique Pelle) + * The "+ register is not tested. + * Size computations in spell file reading are not exactly right. + * Possible overflow when reading corrupted undo file. + CVE-2017-6349 bsc#1027057 + * Another possible overflow when reading corrupted undo file. + CVE-2017-6350 bsc#1027053 + * CTRL-Z and mouse click use CTRL-O unnecessary. + * With 'linebreak' set and 'breakat' includes ">" a double-wide character + results in "<<" displayed. + * Diff mode is not sufficiently tested. + * Warning in tiny build for unused variable. (Tony Mechelynck) + * Misplaced #ifdef. (Christ van Willigen) + * Timer test failed for no apparent reason. + * No tests for arabic. + * Tiny build has a problem with generating the options test. + * compiler warnings + * filtering lines through "cat", without changing the line count, changes + manual folds. + * Test for arabic does not check what is displayed. + * When the window scrolls horizontally when the popup menu is displayed + part of it may not be cleared. (Neovim issue #6184) + * Arabic support is verbose and not well tested. + * GUI test fails with Athena and Motif. + * When the same tag appears more than once, the order is + unpredictable. (Charles Campbell) + * Tabs are not aligned when scrolling horizontally and a Tab doesn't + fit. (Axel Bender) + * Testing the + register fails with Motif. + * 'balloonexpr' only works synchronously. + * Cannot build with the viminfo feature but without the eval feature. + * Illegal memory access with "t". + * Crash when using balloon_show() when not supported. (Hirohito Higashi) + * Some tests have a one second delay. + * Test fails with missing balloon feature. + * :map completion does not have . (Dominique Pelle) + * GUI tests may fail. + * Not enough testing for quickfix. + * v:progpath may become invalid after ":cd". + * The arabic shaping code is verbose. + * Filtering folds with marker method not tested. + * Updating folds does not work properly when inserting a file and a few + other situations. + * set_progpath is defined but not always used + * Newer gettext/iconv library has extra dll file. + * We can't change the case in menu entries, it breaks translations. + * Menu test fails on MS-Windows. + * Menu test fails on MS-Windows using gvim. + * Balloon eval is not tested. + * Balloon test fails on MS-Windows. + * Setting v:progpath is not quite right. + * Test for the clipboard fails sometimes. + * ASAN logs are disabled and don't cause a failure. + * Test for v:progpath fails on MS-Windows. + * When running :make the output may be in the system encoding, different + from 'encoding'. + * Diff mode is displayed wrong when adding a line at the end of a buffer. + * Python test fails with Python 3.6. + * The effect of adding "#" to 'cinoptions' is not always removed. + * Compiler warnings on MS-Windows. (Ajit Thakkar) + * Build errors when building without folding. + +- Drop test87-python36.patch, fixed upstream. + ------------------------------------------------------------------- Thu Feb 16 14:00:34 UTC 2017 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index 40196d9..5c2fc11 100644 --- a/vim.spec +++ b/vim.spec @@ -17,49 +17,14 @@ %define pkg_version 8.0 -%define patchlevel 0324 -%define patchlevel_compact 324 +%define patchlevel 0566 +%define patchlevel_compact 566 %define VIM_SUBDIR vim80 -%define site_runtimepath /usr/share/vim/site -%define make make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/current MAKE="make -e" %{?_smp_mflags} - +%define site_runtimepath %{_datadir}/vim/site +%define make make VIMRCLOC=%{_sysconfdir} VIMRUNTIMEDIR=%{_datadir}/vim/current MAKE="make -e" %{?_smp_mflags} Name: vim Version: %{pkg_version}.%{patchlevel_compact} Release: 0 -BuildRequires: autoconf -BuildRequires: db-devel -BuildRequires: fdupes -BuildRequires: gettext-devel -BuildRequires: gpm-devel -BuildRequires: gtk3-devel -%if 0%{?suse_version} > 1200 -BuildRequires: pkgconfig(xt) -%endif -BuildRequires: krb5-mini -BuildRequires: libacl-devel -BuildRequires: lua-devel -BuildRequires: ncurses-devel -BuildRequires: perl -BuildRequires: pkgconfig -BuildRequires: python-devel -BuildRequires: python3-devel -# Needed to convert svg to png -BuildRequires: rsvg-view -BuildRequires: ruby-devel -BuildRequires: update-desktop-files -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: fileutils -PreReq: sh-utils -%{?libperl_requires} -Provides: vi -Provides: vim-base = %{version}-%{release} -Provides: vim-enhanced = %{version}-%{release} -Provides: vim-python = %{version}-%{release} -Obsoletes: vim-base < %{version}-%{release} -Obsoletes: vim-enhanced < %{version}-%{release} -Obsoletes: vim-python < %{version}-%{release} -Provides: vim_client -Recommends: vim-data = %{version}-%{release} Summary: Vi IMproved License: Vim Group: Productivity/Editors/Vi @@ -92,8 +57,44 @@ Patch15: %{name}-7.4-filetype_apparmor.patch Patch18: %{name}-7.3-filetype_spec.patch Patch21: %{name}-7.3-filetype_changes.patch Patch22: %{name}-7.4-filetype_mine.patch -Patch23: test87-python36.patch +Patch23: vim-8.0-ttytype-test.patch Patch100: vim73-no-static-libpython.patch +BuildRequires: autoconf +BuildRequires: db-devel +BuildRequires: fdupes +BuildRequires: gettext-devel +BuildRequires: gpm-devel +BuildRequires: gtk3-devel +BuildRequires: krb5-mini +BuildRequires: libacl-devel +BuildRequires: lua-devel +BuildRequires: ncurses-devel +BuildRequires: perl +BuildRequires: pkgconfig +BuildRequires: python-devel +BuildRequires: python3-devel +# Needed to convert svg to png +BuildRequires: rsvg-view +BuildRequires: ruby-devel +BuildRequires: update-desktop-files +PreReq: fileutils +PreReq: sh-utils +Requires(post): update-alternatives +Requires(postun): update-alternatives +Recommends: vim-data = %{version}-%{release} +Provides: vi +Provides: vim-base = %{version}-%{release} +Provides: vim-enhanced = %{version}-%{release} +Provides: vim-python = %{version}-%{release} +Obsoletes: vim-base < %{version}-%{release} +Obsoletes: vim-enhanced < %{version}-%{release} +Obsoletes: vim-python < %{version}-%{release} +Provides: vim_client +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{?libperl_requires} +%if 0%{?suse_version} > 1200 +BuildRequires: pkgconfig(xt) +%endif %description Vim (Vi IMproved) is an almost compatible version of the UNIX editor @@ -104,31 +105,22 @@ file name completion, block operations, and editing of binary data. %package data Summary: Vi IMproved -Group: Productivity/Editors/Vi -BuildArch: noarch # Used to be in vim-plugins package +Group: Productivity/Editors/Vi Obsoletes: vim-plugin-matchit <= 1.13.2 Provides: vim-plugin-matchit = 1.13.2 +BuildArch: noarch %description data -Vim (Vi IMproved) is an almost compatible version of the UNIX editor -vi. Almost every possible command can be performed using only ASCII -characters. Only the 'Q' command is missing (you do not need it). Many -new features have been added: multilevel undo, command line history, -file name completion, block operations, and editing of binary data. - -Vi is available for the AMIGA, MS-DOS, Windows NT, and various versions -of UNIX. - -For SUSE Linux, Vim is used as /usr/bin/vi. - -Package vim-data contains the runtime files. +This package contains optional runtime & syntax files for vim. %package -n gvim Summary: A GUI for Vi Group: Productivity/Editors/Vi Requires: gvim_client -Requires: vim-data +Requires: vim-data = %{version}-%{release} +Requires(post): update-alternatives +Requires(postun): update-alternatives Provides: gvim-base = %{version}-%{release} Provides: gvim-enhanced = %{version}-%{release} Obsoletes: gvim-base < %{version}-%{release} @@ -138,8 +130,6 @@ Provides: vi Provides: vim_client %description -n gvim -Copy and modify /usr/share/vim/current/gvimrc to ~/.gvimrc if needed. - Package gvim contains the largest set of features of vim, which is graphical windows and language interpreter, like python, ruby, or perl. You need package vim for the help and other documentation too. If you @@ -162,9 +152,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim %patch18 -p1 %patch21 -p1 %patch22 -p1 -%if 0%{?python3_version_nodots} >= 36 %patch23 -p1 -%endif %patch100 -p1 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . @@ -206,10 +194,10 @@ autoconf popd # build vim -%configure ${COMMON_OPTIONS} --disable-gui --disable-gpm +%configure ${COMMON_OPTIONS} --disable-gui --disable-gpm --with-x=no sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h make %{?_smp_mflags} -cp src/vim vim +cp src/vim vim-nox11 # build gvim make distclean @@ -227,7 +215,7 @@ gcc %{optflags} %{SOURCE13} -o vitmp for size in %{_datadir}/icons/hicolor/*[0-9]x[0-9]*; do SIZE=$(echo $size | awk -Fx {'print $2}') install -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/${SIZE}x${SIZE}/apps - rsvg-convert -h ${SIZE} -w ${SIZE} %{S:24} -o %{buildroot}%{_datadir}/icons/hicolor/${SIZE}x${SIZE}/apps/gvim.png + rsvg-convert -h ${SIZE} -w ${SIZE} %{SOURCE24} -o %{buildroot}%{_datadir}/icons/hicolor/${SIZE}x${SIZE}/apps/gvim.png done install -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/scalable/apps install -m 0644 %{SOURCE24} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/gvim.svg @@ -241,14 +229,17 @@ for f in egvim egview eview evim gex gvi gview gvimdiff rgview rgvim ; do done # install vim -install -D -m 0755 vim %{buildroot}/bin/vim +install -D -m 0755 vim-nox11 %{buildroot}%{_bindir}/vim-nox11 +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +ln -s -f %{_sysconfdir}/alternatives/vim %{buildroot}%{_bindir}/vim # compat symlinks -ln -s -f /bin/vim %{buildroot}/bin/vi -ln -s -f /bin/vim %{buildroot}%{_bindir}/vim -ln -s -f /bin/vim %{buildroot}%{_bindir}/vi -ln -s -f vim %{buildroot}%{_bindir}/edit -ln -s -f /bin/vim %{buildroot}/bin/ex +mkdir %{buildroot}/bin +ln -s -f %{_bindir}/vim %{buildroot}/bin/vi +ln -s -f %{_bindir}/vim %{buildroot}/bin/vim +ln -s -f vim %{buildroot}%{_bindir}/vi +ln -s -f vim %{buildroot}%{_bindir}/edit +ln -s -f %{_bindir}/vim %{buildroot}/bin/ex # man pages ln -s -f vim.1.gz %{buildroot}%{_mandir}/man1/vi.1.gz @@ -325,7 +316,7 @@ rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/macros/maze/*.c rm %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tools/demoserver.py # Create ghost files (see vim.conf) -mkdir -p %{buildroot}/var/run/vi.recover +mkdir -p %{buildroot}%{_localstatedir}/run/vi.recover %fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/lang %fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tutor @@ -340,17 +331,32 @@ export TERM=linux # Reset the terminal scrolling region left behind by the testsuite trap "printf '\e[r'" EXIT # Look for "TEST FAILURE" in the build log -make test +LC_ALL=en_US.UTF-8 make test + +%post +%{_sbindir}/update-alternatives --install %{_bindir}/vim vim %{_bindir}/vim-nox11 10 + +%postun +if [ ! -e %{_bindir}/vim-nox11 ] ; then + %{_sbindir}/update-alternatives --remove vim %{_bindir}/vim-nox11 +fi %post -n gvim +%{_sbindir}/update-alternatives --install %{_bindir}/vim vim %{_bindir}/gvim 20 %icon_theme_cache_post %postun -n gvim +if [ ! -e %{_bindir}/gvim ] ; then + %{_sbindir}/update-alternatives --remove vim %{_bindir}/gvim +fi %icon_theme_cache_postun %files %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/vimrc +%ghost %{_sysconfdir}/alternatives/vim +%{_bindir}/vim-nox11 +%{_bindir}/vim # symlinks /bin/vi /bin/vim @@ -360,7 +366,6 @@ make test %{_bindir}/rview %{_bindir}/rvim %{_bindir}/vi -%{_bindir}/vim %{_bindir}/view %{_bindir}/vimdiff # additional binaries @@ -487,6 +492,8 @@ make test %defattr(-,root,root,-) %doc runtime/doc/gui_x11.txt %ghost %config(missingok) %{_sysconfdir}/gvimrc +%ghost %{_sysconfdir}/alternatives/vim +%{_bindir}/vim %{_bindir}/egview %{_bindir}/egvim %{_bindir}/eview