Accepting request 98042 from editors
- Update to patchlevel 382, fixes the following problems
* IME characters are inserted twice.
* C-indenting wrong for a function header.
* C-indenting wrong for static enum.
* No support for bitwise AND, OR, XOR and invert.
* A tags file with an extremely long name may cause
an infinite loop.
- add autoconf as buildrequire to avoid implicit dependency
- Update to patchlevel 372, fixes the following problems
* Crash when using a large Unicode character in a file that has
syntax highlighting.
* :wundo and :rundo use a wrong checksum.
* When using a command line mapping to <Up> with file name
completion to go one directory up, 'wildchar' is inserted.
OBS-URL: https://build.opensuse.org/request/show/98042
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vim?expand=0&rev=79
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
8ad58a4414
@ -1,102 +0,0 @@
|
||||
--- runtime/plugin/gzip.vim
|
||||
+++ runtime/plugin/gzip.vim 2007-07-10 14:32:54.000000000 +0200
|
||||
@@ -20,17 +20,21 @@ augroup gzip
|
||||
"
|
||||
" Set binary mode before reading the file.
|
||||
" Use "gzip -d", gunzip isn't always available.
|
||||
- autocmd BufReadPre,FileReadPre *.gz,*.bz2,*.Z setlocal bin
|
||||
+ autocmd BufReadPre,FileReadPre *.gz,*.bz2,*.Z,*.lzma setlocal bin
|
||||
autocmd BufReadPost,FileReadPost *.gz call gzip#read("gzip -dn")
|
||||
autocmd BufReadPost,FileReadPost *.bz2 call gzip#read("bzip2 -d")
|
||||
autocmd BufReadPost,FileReadPost *.Z call gzip#read("uncompress")
|
||||
+ autocmd BufReadPost,FileReadPost *.lzma call gzip#read("lzma -d")
|
||||
autocmd BufWritePost,FileWritePost *.gz call gzip#write("gzip")
|
||||
autocmd BufWritePost,FileWritePost *.bz2 call gzip#write("bzip2")
|
||||
autocmd BufWritePost,FileWritePost *.Z call gzip#write("compress -f")
|
||||
+ autocmd BufWritePost,FileWritePost *.lzma call gzip#write("lzma")
|
||||
autocmd FileAppendPre *.gz call gzip#appre("gzip -dn")
|
||||
autocmd FileAppendPre *.bz2 call gzip#appre("bzip2 -d")
|
||||
autocmd FileAppendPre *.Z call gzip#appre("uncompress")
|
||||
+ autocmd FileAppendPre *.lzma call gzip#appre("lzma -d")
|
||||
autocmd FileAppendPost *.gz call gzip#write("gzip")
|
||||
autocmd FileAppendPost *.bz2 call gzip#write("bzip2")
|
||||
autocmd FileAppendPost *.Z call gzip#write("compress -f")
|
||||
+ autocmd FileAppendPost *.lzma call gzip#write("lzma")
|
||||
augroup END
|
||||
--- runtime/autoload/tar.vim
|
||||
+++ runtime/autoload/tar.vim 2008-08-27 14:53:48.000000000 +0200
|
||||
@@ -371,6 +371,14 @@ fun! tar#Write(fname)
|
||||
let tarfile = substitute(tarfile,'\.bz2','','e')
|
||||
let compress= "bzip2 -- ".s:Escape(tarfile,0)
|
||||
" call Decho("compress<".compress.">")
|
||||
+ elseif tarfile =~# '\.lzma'
|
||||
+ call system("lzma -d ".tarfile)
|
||||
+ let tarfile = substitute(tarfile,'\.lzma','','e')
|
||||
+ let compress= "lzma '".tarfile."'"
|
||||
+ elseif tarfile =~# '\.tlz'
|
||||
+ call system("lzma -d ".tarfile)
|
||||
+ let tarfile = substitute(tarfile,'\.tlz','tar','e')
|
||||
+ let compress= "lzma '".tarfile."'"
|
||||
endif
|
||||
" call Decho("tarfile<".tarfile.">")
|
||||
|
||||
--- runtime/autoload/getscript.vim
|
||||
+++ runtime/autoload/getscript.vim 2008-08-27 14:54:40.000000000 +0200
|
||||
@@ -542,6 +542,11 @@ fun! s:GetOneScript(...)
|
||||
exe "silent !gunzip ".s:Escape(sname)
|
||||
let sname= substitute(sname,'\.gz$','','')
|
||||
" call Decho("decompress: new sname<".sname."> after gunzip")
|
||||
+ elseif sname =~ '\.lzma$'
|
||||
+" call Decho("decompress: attempt to gunzip ".sname)
|
||||
+ exe "silent !unlzma ".sname
|
||||
+ let sname= substitute(sname,'\.lzma$','','')
|
||||
+" call Decho("decompress: new sname<".sname."> after unlzma")
|
||||
endif
|
||||
|
||||
" distribute archive(.zip, .tar, .vba) contents
|
||||
--- runtime/filetype.vim
|
||||
+++ runtime/filetype.vim 2007-07-11 11:35:26.000000000 +0200
|
||||
@@ -34,7 +34,7 @@ au BufNewFile,BufRead ?\+.in
|
||||
" Pattern used to match file names which should not be inspected.
|
||||
" Currently finds compressed files.
|
||||
if !exists("g:ft_ignore_pat")
|
||||
- let g:ft_ignore_pat = '\.\(Z\|gz\|bz2\|zip\|tgz\)$'
|
||||
+ let g:ft_ignore_pat = '\.\(Z\|gz\|bz2\|zip\|tgz\|lzma\|tlz\)$'
|
||||
endif
|
||||
|
||||
" Function used for patterns that end in a star: don't set the filetype if the
|
||||
--- runtime/autoload/netrw.vim
|
||||
+++ runtime/autoload/netrw.vim 2008-08-27 14:49:59.000000000 +0200
|
||||
@@ -1362,6 +1362,9 @@ fun! s:NetrwGetFile(readcmd, tfile, meth
|
||||
elseif rfile =~ '\.tar\.bz2'
|
||||
" call Decho("handling remote bz2-compressed tar file")
|
||||
call tar#Browse(tfile)
|
||||
+ elseif rfile =~ '\.tar\.lzma'
|
||||
+" call Decho("handling remote lzma-compressed tar file")
|
||||
+ call tar#Browse(tfile)
|
||||
else
|
||||
" call Decho("edit temporary file")
|
||||
e!
|
||||
@@ -7237,7 +7240,7 @@ fun! s:GetTempfile(fname)
|
||||
if a:fname != ""
|
||||
if a:fname =~ '\.[^./]\+$'
|
||||
" call Decho("using fname<".a:fname.">'s suffix")
|
||||
- if a:fname =~ '.tar.gz' || a:fname =~ '.tar.bz2'
|
||||
+ if a:fname =~ '.tar.gz' || a:fname =~ '.tar.bz2' || a:fname =~ '.tar.lzma'
|
||||
let suffix = ".tar".substitute(a:fname,'^.*\(\.[^./]\+\)$','\1','e')
|
||||
else
|
||||
let suffix = substitute(a:fname,'^.*\(\.[^./]\+\)$','\1','e')
|
||||
--- runtime/autoload/vimball.vim
|
||||
+++ runtime/autoload/vimball.vim 2008-08-27 14:55:40.000000000 +0200
|
||||
@@ -516,6 +516,11 @@ fun! vimball#Decompress(fname)
|
||||
exe "e ".escape(fname,' \')
|
||||
call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)")
|
||||
|
||||
+ elseif expand("%") =~ '.*\.lzma' && executable("unlzma")
|
||||
+ exe "!unlzma ".a:fname
|
||||
+ let fname= substitute(a:fname,'\.lzma$','','')
|
||||
+ exe "e ".escape(fname,' \')
|
||||
+ call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)")
|
||||
elseif expand("%") =~ '.*\.zip' && executable("unzip")
|
||||
" handle *.zip with unzip
|
||||
silent exe "!unzip ".s:Escape(a:fname)
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e624d64687f0f736b7367218fddac2508414569044b916bb6cac69218c89fe86
|
||||
size 353023
|
||||
oid sha256:952d3169e13434e875588d158ed4da890f3fd0aa2de015593bdd4657fb91cab8
|
||||
size 366696
|
||||
|
||||
26
vim.changes
26
vim.changes
@ -1,3 +1,29 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 23 11:18:17 UTC 2011 - idonmez@suse.com
|
||||
|
||||
- Update to patchlevel 382, fixes the following problems
|
||||
* IME characters are inserted twice.
|
||||
* C-indenting wrong for a function header.
|
||||
* C-indenting wrong for static enum.
|
||||
* No support for bitwise AND, OR, XOR and invert.
|
||||
* A tags file with an extremely long name may cause
|
||||
an infinite loop.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 21 10:51:09 UTC 2011 - coolo@suse.com
|
||||
|
||||
- add autoconf as buildrequire to avoid implicit dependency
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 9 13:20:50 UTC 2011 - idonmez@suse.com
|
||||
|
||||
- Update to patchlevel 372, fixes the following problems
|
||||
* Crash when using a large Unicode character in a file that has
|
||||
syntax highlighting.
|
||||
* :wundo and :rundo use a wrong checksum.
|
||||
* When using a command line mapping to <Up> with file name
|
||||
completion to go one directory up, 'wildchar' is inserted.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 7 10:09:25 UTC 2011 - aj@suse.de
|
||||
|
||||
|
||||
25
vim.spec
25
vim.spec
@ -15,17 +15,14 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
|
||||
Name: vim
|
||||
Version: 7.3
|
||||
Release: 1
|
||||
License: Vim
|
||||
Group: Productivity/Editors/Vi
|
||||
Release: 0
|
||||
BuildRequires: db-devel
|
||||
%if 0%{?suse_version} > 1020
|
||||
BuildRequires: fdupes
|
||||
%endif
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: gettext-devel
|
||||
BuildRequires: gtk2-devel
|
||||
BuildRequires: libacl-devel
|
||||
@ -47,7 +44,7 @@ BuildRequires: gpm
|
||||
%endif
|
||||
#
|
||||
%define pkg_version 7.3
|
||||
%define official_ptchlvl 364
|
||||
%define official_ptchlvl 382
|
||||
%define VIM_SUBDIR vim73
|
||||
%define site_runtimepath /usr/share/vim/site
|
||||
#
|
||||
@ -74,6 +71,8 @@ Provides: vi
|
||||
Recommends: vim-data = %{version}
|
||||
%endif
|
||||
Summary: Vi IMproved
|
||||
License: Vim
|
||||
Group: Productivity/Editors/Vi
|
||||
#
|
||||
Url: http://www.vim.org/
|
||||
Source: ftp://ftp.vim.org/pub/vim/unix/vim-%{pkg_version}.tar.bz2
|
||||
@ -109,7 +108,6 @@ Patch18: %{name}-7.3-filetype_spec.patch
|
||||
Patch19: %{name}-7.3-diff_check.patch
|
||||
Patch21: %{name}-7.3-filetype_changes.patch
|
||||
Patch22: %{name}-7.3-filetype_mine.patch
|
||||
Patch25: vim-7.2-lzma-support.patch
|
||||
Patch100: vim-7.1.314-CVE-2009-0316-debian.patch
|
||||
Patch101: vim73-no-static-libpython.patch
|
||||
|
||||
@ -276,12 +274,9 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim
|
||||
%patch19 -p1
|
||||
%patch21 -p1
|
||||
%patch22 -p1
|
||||
#%patch25
|
||||
%patch100 -p1
|
||||
%patch101
|
||||
cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE8} %{SOURCE10} .
|
||||
#rename no nb $RPM_BUILD_DIR/vim*/src/po/no.*
|
||||
#rename menu_no menu_nb $RPM_BUILD_DIR/vim*/runtime/lang/menu_no*
|
||||
|
||||
%build
|
||||
export CFLAGS="%{optflags} -Wall -pipe -fno-strict-aliasing"
|
||||
@ -309,16 +304,12 @@ export SCRIPT_OPTIONS="\
|
||||
--enable-tclinterp \
|
||||
--with-tclsh=%{_bindir}/tclsh \
|
||||
--with-python-config-dir=%{py_libdir}/config"
|
||||
# TODO:
|
||||
# - if suse_version for gnome path
|
||||
|
||||
export GUI_OPTIONS="\
|
||||
--enable-xim \
|
||||
--enable-fontset \
|
||||
--enable-gnome-check \
|
||||
--enable-gui=gnome2 \
|
||||
--enable-gtk2-check \
|
||||
--with-gtk-prefix=/opt/gnome \
|
||||
--with-gnome=/opt/gnome"
|
||||
--enable-gui=gtk2 \
|
||||
--enable-gtk2-check"
|
||||
|
||||
pushd src
|
||||
autoconf
|
||||
|
||||
Loading…
Reference in New Issue
Block a user