pool/vim
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to version 7.4

Browse Source 
* A new, faster regular expression engine.
  * More than a thousand fixes and small improvements.
- Drop vim-7.3-grub.patch, applied upstream
- Refresh the following patches
  * vim-7.4-disable_lang_no.patch
  * vim-7.4-filetype_apparmor.patch
  * vim-7.4-filetype_mine.patch
  * vim-7.4-highlight_fstab.patch

OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=149
This commit is contained in:
Ismail Dönmez 2013-08-12 07:21:11 +00:00 committed by Git OBS Bridge
parent 7143a35691
commit 973c31bae0
17 changed files with 141 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
ANNOUNCEMENT.vim-7.3
View File

@ -1,126 +0,0 @@
Subject: Vim version 7.3 released!
From: Bram Moolenaar <Bram@moolenaar.net>
Date: Sun, 15 Aug 2010 21:52:04 +0200
Hello Vim users,
Announcing: Vim (Vi IMproved) version 7.3
This is a minor release of Vim. It consists of Vim 7.2 plus all
patches, updated runtime files and some more, see below. It has been
two years since the 7.2 release, thus it's not that "minor". But not
"major" either. Something in between, don't know how to call that.
The most notable additions since 7.2:
- Persistent undo and undo for reload
- Blowfish encryption, encryption of the swap file
- Conceal text
- Lua interface
- Python 3 interface
Once you have installed Vim 7.3 you can find all the details about the
changes since Vim 7.2 with:
:help version-7.3
Gratitude
---------
If you like Vim, this is the way to say thanks:
http://iccf-holland.org/clinic.html
Where to get it
---------------
The best way to obtain the latest Vim 7.3 is using Mercurial.
Summary:
hg clone https://vim.googlecode.com/hg/ vim
cd vim/src
hg update vim73
make
More information here: http://www.vim.org/mercurial.php
All downloadable files can be found below this directory:
ftp://ftp.vim.org/pub/vim/
Direct link to the MS-Windows self-installing executable:
ftp://ftp.vim.org/pub/vim/pc/gvim73.exe
Information about which files to download for what system:
http://www.vim.org/download.php
A list of mirror sites can be found here:
http://www.vim.org/mirrors.php
UNIX:
unix/vim-7.3.tar.bz2 sources + runtime files, bzip2 compressed
MS-WINDOWS one-size-fits-all:
pc/gvim73.exe installer for GUI and console executables,
includes all runtime files, many features
VARIOUS:
doc/vim73html.zip help files converted to HTML
MS-WINDOWS separate files:
pc/vim73rt.zip runtime files
pc/gvim73.zip GUI binary for Windows 95/98/NT/2000/XP
pc/gvim73ole.zip GUI binary with OLE support
pc/gvim73_s.zip GUI binary for Windows 3.1 (untested)
pc/vim73d32.zip console version for MS-DOS/Windows 95/98
pc/vim73w32.zip console version for Windows NT/2000/XP
pc/vim73src.zip sources for PC (with CR-LF)
DIFFS TO PREVIOUS RELEASE:
unix/vim-7.2-7.3.diff.gz sources + runtime files
unstable/unix/vim-7.3f-7.3.diff.gz sources + runtime files
Omitted in this version are:
- Extra and lang archives, these are now included in the main source
and runtime archives.
- The 16-bit DOS, OS/2 and Amiga versions, these are obsolete.
Mailing lists
-------------
For user questions you can turn to the Vim mailing list. There are a
lot of tips, scripts and solutions. You can ask your Vim questions, but
only if you subscribe. See http://www.vim.org/maillist.php#vim
If you want to help Vim development, discuss new features or get the
latest patches, subscribe to the vim-dev mailing list. See
http://www.vim.org/maillist.php#vim-dev
Subject specific lists:
Multi-byte issues: http://www.vim.org/maillist.php#vim-multibyte
Macintosh issues: http://www.vim.org/maillist.php#vim-mac
Before you ask a question you should search the archives, someone may
already have given the answer.
Reporting bugs
--------------
Send them to <vim-...@vim.org>. Please describe the problem precisely.
All the time spent on answering mail is subtracted from the time that is
spent on improving Vim! Always give a reproducible example and try to
find out which settings or other things influence the appearance of the
bug. Try starting without your own vimrc file: "vim -u NONE". Try
different machines if possible. See ":help bugs" in Vim. Send me a
patch if you can!
Happy Vimming!
--
Q: Should I clean my house or work on Vim?
A: Whatever contains more bugs.
/// Bram Moolenaar -- B...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ download, build and distribute -- http://www.A-A-P.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_dev" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---


20
vim-7.1.314-CVE-2009-0316-debian.patch
View File

@ -1,14 +1,16 @@
--- ./src/if_python.c 2013-02-21 15:31:24.901839791 +0100
+++ ./src/if_python.c 2013-02-21 15:36:32.938839246 +0100
@@ -631,6 +631,7 @@
static void PythonIO_Flush(void);
static int PythonIO_Init(void);
Index: vim74/src/if_python.c
===================================================================
--- vim74.orig/src/if_python.c
+++ vim74/src/if_python.c
@@ -806,6 +806,7 @@ py_memsave(void *p, size_t len)
*/
static int PythonMod_Init(void);
+static void Python_FixPath(void);
/* Utility functions for the vim/python interface
* ----------------------------------------------
@@ -766,6 +767,11 @@
/******************************************************
@@ -933,6 +934,11 @@ Python_Init(void)
* the current directory in sys.path. */
PyRun_SimpleString("import sys; sys.path = filter(lambda x: x != '/must>not&exist', sys.path)");
@ -20,7 +22,7 @@
/* lock is created and acquired in PyEval_InitThreads() and thread
* state is created in Py_Initialize()
* there _PyGILState_NoteThreadState() also sets gilcounter to 1
@@ -1598,6 +1604,28 @@
@@ -1417,6 +1423,28 @@ PythonMod_Init(void)
return 0;
}

27
vim-7.3-disable_lang_no.patch
View File

@ -1,27 +0,0 @@
diff -rup vim73.orig/src/po/Makefile vim73/src/po/Makefile
--- vim73.orig/src/po/Makefile 2010-08-07 13:37:24.000000000 +0200
+++ vim73/src/po/Makefile 2010-11-21 11:10:56.770088582 +0100
@@ -20,7 +20,6 @@ LANGUAGES = \
ko \
ko.UTF-8 \
nb \
- no \
pl \
pt_BR \
ru \
@@ -49,7 +48,6 @@ MOFILES = \
ko.mo \
ko.UTF-8.mo \
nb.mo \
- no.mo \
pl.mo \
pt_BR.mo \
ru.mo \
@@ -88,7 +86,6 @@ CHECKFILES = \
ko.ck \
ko.UTF-8.ck \
nb.ck \
- no.ck \
pl.ck \
pt_BR.ck \
ru.ck \

14
vim-7.3-filetype_apparmor.patch
View File

@ -1,14 +0,0 @@
diff -rupN vim73.orig/runtime/filetype.vim vim73/runtime/filetype.vim
--- vim73.orig/runtime/filetype.vim 2010-08-03 22:44:00.000000000 +0200
+++ vim73/runtime/filetype.vim 2010-11-21 05:43:34.224214064 +0100
@@ -113,6 +113,10 @@ au BufNewFile,BufRead proftpd.conf* cal
au BufNewFile,BufRead .htaccess,/etc/httpd/*.conf setf apache
au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf*,/etc/httpd/conf.d/*.conf* call s:StarSetf('apache')
+" AppArmor
+au BufNewFile,BufRead */etc/apparmor.d/* setf apparmor
+au BufNewFile,BufRead */etc/apparmor/profiles/* setf apparmor
+
" XA65 MOS6510 cross assembler
au BufNewFile,BufRead *.a65 setf a65

12
vim-7.3-filetype_mine.patch
View File

@ -1,12 +0,0 @@
diff -rupN vim73.orig/runtime/filetype.vim vim73/runtime/filetype.vim
--- vim73.orig/runtime/filetype.vim 2011-02-28 21:16:54.188858309 +0100
+++ vim73/runtime/filetype.vim 2011-02-28 21:18:28.628849670 +0100
@@ -17,7 +17,7 @@ augroup filetypedetect
" Ignored extensions
if exists("*fnameescape")
-au BufNewFile,BufRead ?\+.orig,?\+.bak,?\+.old,?\+.new,?\+.dpkg-dist,?\+.dpkg-old,?\+.rpmsave,?\+.rpmnew
+au BufNewFile,BufRead ?\+.orig,?\+.bak,?\+.old,?\+.new,?\+.mine,?\+.dpkg-dist,?\+.dpkg-old,?\+.rpmsave,?\+.rpmnew
\ exe "doau filetypedetect BufRead " . fnameescape(expand("<afile>:r"))
au BufNewFile,BufRead *~
\ let s:name = expand("<afile>") |

12
vim-7.3-grub.patch
View File

@ -1,12 +0,0 @@
diff -rup vim73.orig/runtime/filetype.vim vim73/runtime/filetype.vim
--- vim73.orig/runtime/filetype.vim 2010-08-03 22:44:00.000000000 +0200
+++ vim73/runtime/filetype.vim 2010-11-21 05:38:50.752088445 +0100
@@ -157,7 +157,7 @@ au BufNewFile,BufRead *.asp
\ endif
" Grub (must be before catch *.lst)
-au BufNewFile,BufRead /boot/grub/menu.lst,/boot/grub/grub.conf,/etc/grub.conf setf grub
+au BufNewFile,BufRead */boot/grub/menu.lst,*/boot/grub/grub.conf,*/etc/grub.conf setf grub
" Assembly (all kinds)
" *.lst is not pure assembly, it has two extra columns (address, byte codes)

30
vim-7.3-highlight_fstab.patch
View File

@ -1,30 +0,0 @@
diff -rup vim73.orig/runtime/syntax/fstab.vim vim73/runtime/syntax/fstab.vim
--- vim73.orig/runtime/syntax/fstab.vim 2010-05-15 13:03:56.000000000 +0200
+++ vim73/runtime/syntax/fstab.vim 2010-11-21 05:01:19.457089623 +0100
@@ -30,7 +30,7 @@ syn match fsOperator /[,=:#]/
" Device
syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError
syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@:\.-]\|^\w\{-}\ze\W\)/ contained
-syn keyword fsDeviceKeyword contained none proc linproc tmpfs devpts sysfs usbfs
+syn keyword fsDeviceKeyword contained none proc linproc tmpfs debugfs devpts sysfs usbfs
syn keyword fsDeviceKeyword contained LABEL nextgroup=fsDeviceLabel
syn keyword fsDeviceKeyword contained UUID nextgroup=fsDeviceUUID
syn keyword fsDeviceKeyword contained sshfs nextgroup=fsDeviceSshfs
@@ -47,7 +47,7 @@ syn keyword fsMountPointKeyword containe
" Type
syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown
syn match fsTypeUnknown /\s\+\zs\w\+/ contained
-syn keyword fsTypeKeyword contained adfs ados affs atfs audiofs auto autofs befs bfs cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext2fs ext3 ext4 fdesc ffs filecore fuse hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs qnx4 reiserfs romfs shm smbfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
+syn keyword fsTypeKeyword contained adfs ados affs atfs audiofs auto autofs befs bfs binfmt_misc cd9660 cfs cifs coda cramfs debugfs devfs devpts e2compr efs ext2 ext2fs ext3 ext4 ext4dev fdesc ffs filecore fuse hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs qnx4 reiserfs romfs rpc_pipefs shm smbfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
" Options
" -------
@@ -59,7 +59,7 @@ syn match fsOptionsString /[a-zA-Z0-9_-]
syn keyword fsOptionsYesNo yes no
syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
syn keyword fsOptionsSize 512 1024 2048
-syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand nosuid nosymfollow nouser owner rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user users xx
+syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop managed mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand nosuid nosymfollow nouser owner pamconsole rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user users xx
syn match fsOptionsGeneral /_netdev/
" Options: adfs

3
vim-7.3-patches.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:812034f2f6a6cac42743b02e5eaa77df26bdca0d415e6f19d28bb2f434125171
size 1067974

3
vim-7.3.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5c5d5d6e07f1bbc49b6fe3906ff8a7e39b049928b68195b38e3e3d347100221d
size 9080692

28
vim-7.4-disable_lang_no.patch Normal file
View File

@ -0,0 +1,28 @@
Index: vim74/src/po/Makefile
===================================================================
--- vim74.orig/src/po/Makefile
+++ vim74/src/po/Makefile
@@ -21,7 +21,6 @@ LANGUAGES = \
ko.UTF-8 \
nb \
nl \
- no \
pl \
pt_BR \
ru \
@@ -62,7 +61,6 @@ MOFILES = \
ko.UTF-8.mo \
nb.mo \
nl.mo \
- no.mo \
pl.mo \
pt_BR.mo \
ru.mo \
@@ -103,7 +101,6 @@ CHECKFILES = \
ko.UTF-8.ck \
nb.ck \
nl.ck \
- no.ck \
pl.ck \
pt_BR.ck \
ru.ck \

15
vim-7.4-filetype_apparmor.patch Normal file
View File

@ -0,0 +1,15 @@
Index: vim74/runtime/filetype.vim
===================================================================
--- vim74.orig/runtime/filetype.vim
+++ vim74/runtime/filetype.vim
@@ -112,6 +112,10 @@ au BufNewFile,BufRead proftpd.conf* cal
" Apache config file
au BufNewFile,BufRead .htaccess,*/etc/httpd/*.conf setf apache
+" AppArmor
+au BufNewFile,BufRead */etc/apparmor.d/* setf apparmor
+au BufNewFile,BufRead */etc/apparmor/profiles/* setf apparmor
+
" XA65 MOS6510 cross assembler
au BufNewFile,BufRead *.a65 setf a65

13
vim-7.4-filetype_mine.patch Normal file
View File

@ -0,0 +1,13 @@
Index: vim74/runtime/filetype.vim
===================================================================
--- vim74.orig/runtime/filetype.vim
+++ vim74/runtime/filetype.vim
@@ -17,7 +17,7 @@ augroup filetypedetect
" Ignored extensions
if exists("*fnameescape")
-au BufNewFile,BufRead ?\+.orig,?\+.bak,?\+.old,?\+.new,?\+.dpkg-dist,?\+.dpkg-old,?\+.dpkg-new,?\+.dpkg-bak,?\+.rpmsave,?\+.rpmnew
+au BufNewFile,BufRead ?\+.orig,?\+.bak,?\+.old,?\+.mine,?\+.new,?\+.dpkg-dist,?\+.dpkg-old,?\+.dpkg-new,?\+.dpkg-bak,?\+.rpmsave,?\+.rpmnew
\ exe "doau filetypedetect BufRead " . fnameescape(expand("<afile>:r"))
au BufNewFile,BufRead *~
\ let s:name = expand("<afile>") |

31
vim-7.4-highlight_fstab.patch Normal file
View File

@ -0,0 +1,31 @@
Index: vim74/runtime/syntax/fstab.vim
===================================================================
--- vim74.orig/runtime/syntax/fstab.vim
+++ vim74/runtime/syntax/fstab.vim
@@ -36,7 +36,7 @@ syn match fsOperator /[,=:#]/
" Device
syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError
syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@:\.-]\|^\w\{-}\ze\W\)/ contained
-syn keyword fsDeviceKeyword contained none proc linproc tmpfs devpts devtmpfs sysfs usbfs
+syn keyword fsDeviceKeyword contained none proc linproc tmpfs debugfs devpts devtmpfs sysfs usbfs
syn keyword fsDeviceKeyword contained LABEL nextgroup=fsDeviceLabel
syn keyword fsDeviceKeyword contained UUID nextgroup=fsDeviceUUID
syn keyword fsDeviceKeyword contained sshfs nextgroup=fsDeviceSshfs
@@ -53,7 +53,7 @@ syn keyword fsMountPointKeyword containe
" Type
syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown
syn match fsTypeUnknown /\s\+\zs\w\+/ contained
-syn keyword fsTypeKeyword contained adfs ados affs anon_inodefs atfs audiofs auto autofs bdev befs bfs btrfs binfmt_misc cd9660 cfs cgroup cifs coda configfs cpuset cramfs devfs devpts devtmpfs e2compr efs ext2 ext2fs ext3 ext4 fdesc ffs filecore fuse fuseblk fusectl hfs hpfs hugetlbfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfsd nilfs2 none ntfs null nwfs overlay ovlfs pipefs portal proc procfs pstore ptyfs qnx4 reiserfs ramfs romfs securityfs shm smbfs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xenfs xfs zisofs
+syn keyword fsTypeKeyword contained adfs ados affs anon_inodefs atfs audiofs auto autofs bdev befs bfs btrfs binfmt_misc cd9660 cfs cgroup cifs coda configfs cpuset cramfs debugfs devfs devpts devtmpfs e2compr efs ext2 ext2fs ext3 ext4 ext4dev fdesc ffs filecore fuse fuseblk fusectl hfs hpfs hugetlbfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfsd nilfs2 none ntfs null nwfs overlay ovlfs pipefs portal proc procfs pstore ptyfs qnx4 reiserfs ramfs romfs rpc_pipefs securityfs shm smbfs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xenfs xfs zisofs
" Options
" -------
@@ -65,7 +65,7 @@ syn match fsOptionsString /[a-zA-Z0-9_-]
syn keyword fsOptionsYesNo yes no
syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
syn keyword fsOptionsSize 512 1024 2048
-syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand nosuid nosymfollow nouser owner rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user users xx
+syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand nosuid nosymfollow nouser owner pamconsole rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user users xx
syn match fsOptionsGeneral /_netdev/
" Options: adfs

0
vim-7.3-rpmlintrc → vim-7.4-rpmlintrc
View File

3
vim-7.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade
size 9843297

13
vim.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Aug 12 06:35:53 UTC 2013 - idonmez@suse.com
- Update to version 7.4
* A new, faster regular expression engine.
* More than a thousand fixes and small improvements.
- Drop vim-7.3-grub.patch, applied upstream
- Refresh the following patches
* vim-7.4-disable_lang_no.patch
* vim-7.4-filetype_apparmor.patch
* vim-7.4-filetype_mine.patch
* vim-7.4-highlight_fstab.patch
-------------------------------------------------------------------
Mon Jun 17 12:55:13 UTC 2013 - coolo@suse.com

53
vim.spec
View File

@ -16,13 +16,14 @@
#
%define pkg_version 7.3
%define official_ptchlvl 962
%define VIM_SUBDIR vim73
%define pkg_version 7.4
#%define official_ptchlvl 0
%define VIM_SUBDIR vim74
%define site_runtimepath /usr/share/vim/site
Name: vim
Version: 7.3.%{official_ptchlvl}
#Version: 7.4.%{official_ptchlvl}
Version: 7.4
Release: 0
BuildRequires: db-devel
%if 0%{?suse_version} > 1020
@ -84,7 +85,6 @@ Source: ftp://ftp.vim.org/pub/vim/unix/vim-%{pkg_version}.tar.bz2
Source3: suse.vimrc
Source4: vimrc_example1
Source5: vimrc_example2
Source6: ANNOUNCEMENT.vim-%{pkg_version}
Source8: suse.gvimrc
Source10: README.Japanese-XIM
Source13: vitmp.c
@ -94,23 +94,21 @@ Source18: missing-vim-client
Source19: gvim.desktop
Source20: spec.skeleton
Source23: apparmor.vim
Source98: %{name}-7.3-patches.tar.bz2
Source99: %{name}-7.3-rpmlintrc
Patch3: %{name}-7.3-disable_lang_no.patch
#Source98: %{name}-7.4-patches.tar.bz2
Source99: %{name}-7.4-rpmlintrc
Patch3: %{name}-7.4-disable_lang_no.patch
Patch4: %{name}-7.3-gvimrc_fontset.patch
Patch5: %{name}-7.3-highlight_fstab.patch
Patch5: %{name}-7.4-highlight_fstab.patch
Patch6: %{name}-7.3-sh_is_bash.patch
Patch7: %{name}-7.3-filetype_ftl.patch
Patch8: %{name}-7.3-help_tags.patch
Patch9: %{name}-7.3-use_awk.patch
Patch10: %{name}-7.3-name_vimrc.patch
Patch11: %{name}-7.3-mktemp_tutor.patch
Patch14: %{name}-7.3-grub.patch
Patch15: %{name}-7.3-filetype_apparmor.patch
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
Patch22: %{name}-7.4-filetype_mine.patch
Patch100: vim-7.1.314-CVE-2009-0316-debian.patch
Patch101: vim73-no-static-libpython.patch
@ -264,14 +262,14 @@ want less features, you might want to install packages vim-enhanced or
vim instead.
%prep
%setup -q -n %{VIM_SUBDIR} -b 98
for p in ../vim-%{pkg_version}-patches/%{pkg_version}*; do
test -e $p || break
test ${p#*/%{pkg_version}.} -le %{official_ptchlvl} || exit 1
echo Patch $p
patch -s -p0 < $p
done
unset p
%setup -q -n %{VIM_SUBDIR}
#for p in ../vim-%{pkg_version}-patches/%{pkg_version}*; do
# test -e $p || break
# test ${p#*/%{pkg_version}.} -le %{official_ptchlvl} || exit 1
# echo Patch $p
# patch -s -p0 < $p
#done
#unset p
%patch3 -p1
%patch4 -p1
%patch5 -p1
@ -281,8 +279,6 @@ unset p
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch14 -p1
%patch15 -p1
cp %{SOURCE23} runtime/syntax/apparmor.vim
%patch18 -p1
%patch19 -p1
@ -290,7 +286,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim
%patch22 -p1
%patch100 -p1
%patch101
cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE8} %{SOURCE10} .
cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} .
# newer perl? ugly hack to fix build anyway.
%if 0%{?suse_version} > 1210
@ -450,7 +446,7 @@ install -d -m 0755 %{buildroot}%{_docdir}/{,g}vim/
cp runtime/doc/uganda.txt LICENSE
install -D -m 0644 \
vimrc_example1 vimrc_example2 suse.vimrc \
LICENSE README.txt README_src.txt README_unix.txt ANNOUNCEMENT.vim-7.3 \
LICENSE README.txt README_src.txt README_unix.txt \
%{buildroot}%{_docdir}/vim/
# gvim
install -D -m 0644 \
@ -467,8 +463,10 @@ rm -rf %{buildroot}%{_mandir}/pl.UTF-8/
rm -rf %{buildroot}%{_mandir}/ru.KOI8-R/
rm -rf %{buildroot}%{_mandir}/it.ISO8859-1/
rm -rf %{buildroot}%{_mandir}/it.UTF-8/
# and move russian manpages to a place where they can be found
mv %{buildroot}%{_mandir}/ru.UTF-8 %{buildroot}%{_mandir}/ru
# remove some c source files
rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tools/*.c
rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/macros/maze/*.c
@ -484,8 +482,8 @@ mkdir -p %{buildroot}/var/run/vi.recover
%check
# Look for "TEST FAILURE" in the build log
# Currently test 83, 86, 92 fails
make test || true
# Currently all tests pass
make test
%post
/usr/sbin/update-alternatives --install \
@ -588,6 +586,9 @@ fi
%dir %{_mandir}/pl
%dir %{_mandir}/pl/man1/
%{_mandir}/pl/man1/*
%dir %{_mandir}/ja
%dir %{_mandir}/ja/man1/
%{_mandir}/ja/man1/*
# docs and data file
%doc %{_docdir}/vim
#