Hello community, here is the log from the commit of package vim for openSUSE:Factory checked in at 2013-08-12 15:52:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vim (Old) and /work/SRC/openSUSE:Factory/.vim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vim" Changes: -------- --- /work/SRC/openSUSE:Factory/vim/vim.changes 2013-06-18 10:27:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vim.new/vim.changes 2013-08-12 15:52:58.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Aug 12 06:35:53 UTC 2013 - [email protected] + +- 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 + +------------------------------------------------------------------- Old: ---- ANNOUNCEMENT.vim-7.3 vim-7.3-disable_lang_no.patch vim-7.3-filetype_apparmor.patch vim-7.3-filetype_mine.patch vim-7.3-grub.patch vim-7.3-highlight_fstab.patch vim-7.3-patches.tar.bz2 vim-7.3-rpmlintrc vim-7.3.tar.bz2 New: ---- 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 vim-7.4-rpmlintrc vim-7.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vim.spec ++++++ --- /var/tmp/diff_new_pack.m1mdu8/_old 2013-08-12 15:52:59.000000000 +0200 +++ /var/tmp/diff_new_pack.m1mdu8/_new 2013-08-12 15:52:59.000000000 +0200 @@ -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 @@ 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,22 @@ 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 +Patch15: %{name}-7.4-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 +263,14 @@ 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,16 +280,15 @@ %patch9 -p1 %patch10 -p1 %patch11 -p1 -%patch14 -p1 -%patch15 -p1 cp %{SOURCE23} runtime/syntax/apparmor.vim +%patch15 -p1 %patch18 -p1 %patch19 -p1 %patch21 -p1 %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 +448,7 @@ 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 +465,10 @@ 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 +484,8 @@ %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 +588,9 @@ %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 # ++++++ vim-7.1.314-CVE-2009-0316-debian.patch ++++++ --- /var/tmp/diff_new_pack.m1mdu8/_old 2013-08-12 15:52:59.000000000 +0200 +++ /var/tmp/diff_new_pack.m1mdu8/_new 2013-08-12 15:52:59.000000000 +0200 @@ -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; } ++++++ vim-7.3-disable_lang_no.patch -> vim-7.4-disable_lang_no.patch ++++++ --- /work/SRC/openSUSE:Factory/vim/vim-7.3-disable_lang_no.patch 2011-09-23 12:49:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vim.new/vim-7.4-disable_lang_no.patch 2013-08-12 15:52:56.000000000 +0200 @@ -1,26 +1,27 @@ -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 \ +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 \ -@@ -49,7 +48,6 @@ MOFILES = \ - ko.mo \ +@@ -62,7 +61,6 @@ MOFILES = \ ko.UTF-8.mo \ nb.mo \ + nl.mo \ - no.mo \ pl.mo \ pt_BR.mo \ ru.mo \ -@@ -88,7 +86,6 @@ CHECKFILES = \ - ko.ck \ +@@ -103,7 +101,6 @@ CHECKFILES = \ ko.UTF-8.ck \ nb.ck \ + nl.ck \ - no.ck \ pl.ck \ pt_BR.ck \ ++++++ vim-7.3-filetype_apparmor.patch -> vim-7.4-filetype_apparmor.patch ++++++ --- /work/SRC/openSUSE:Factory/vim/vim-7.3-filetype_apparmor.patch 2011-09-23 12:49:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vim.new/vim-7.4-filetype_apparmor.patch 2013-08-12 15:52:56.000000000 +0200 @@ -1,13 +1,14 @@ -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') +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 ++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 ++++++ vim-7.3-filetype_mine.patch -> vim-7.4-filetype_mine.patch ++++++ --- /work/SRC/openSUSE:Factory/vim/vim-7.3-filetype_mine.patch 2011-09-23 12:49:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vim.new/vim-7.4-filetype_mine.patch 2013-08-12 15:52:56.000000000 +0200 @@ -1,12 +1,13 @@ -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 +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,?\+.rpmsave,?\+.rpmnew -+au BufNewFile,BufRead ?\+.orig,?\+.bak,?\+.old,?\+.new,?\+.mine,?\+.dpkg-dist,?\+.dpkg-old,?\+.rpmsave,?\+.rpmnew +-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>") | ++++++ vim-7.3-highlight_fstab.patch -> vim-7.4-highlight_fstab.patch ++++++ --- /work/SRC/openSUSE:Factory/vim/vim-7.3-highlight_fstab.patch 2011-09-23 12:49:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vim.new/vim-7.4-highlight_fstab.patch 2013-08-12 15:52:56.000000000 +0200 @@ -1,30 +1,31 @@ -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 /[,=:#]/ +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 sysfs usbfs -+syn keyword fsDeviceKeyword contained none proc linproc tmpfs debugfs devpts sysfs usbfs +-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 -@@ -47,7 +47,7 @@ syn keyword fsMountPointKeyword containe +@@ -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 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 +-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 " ------- -@@ -59,7 +59,7 @@ syn match fsOptionsString /[a-zA-Z0-9_-] +@@ -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 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 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 ++++++ vim-7.3-rpmlintrc -> vim-7.4-rpmlintrc ++++++ ++++++ vim-7.3-patches.tar.bz2 -> vim-7.4.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/vim/vim-7.3-patches.tar.bz2 /work/SRC/openSUSE:Factory/.vim.new/vim-7.4.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
