Hello community, here is the log from the commit of package vim checked in at Tue Jun 5 01:15:55 CEST 2007. -------- --- vim/vim.changes 2007-05-09 15:11:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/vim/vim.changes 2007-05-23 12:09:16.000000000 +0200 @@ -1,0 +2,16 @@ +Wed May 23 12:05:55 CEST 2007 - mkoenig@suse.de + +- update to version 7.1 +- removed patches: + vim-7.0-fstab_match_uuid.patch + vim-7.0-fix_duplicate_key_assignment_de.patch +- enable syntax highlighting by default [#274600] + +------------------------------------------------------------------- +Tue May 15 17:46:34 CEST 2007 - mrueckert@suse.de + +- move a few files back into the base package so we can e.g. enable + syntax highlighting by default. it would still be black/white + for most filetypes. + +------------------------------------------------------------------- Old: ---- ANNOUNCEMENT.vim-7.0 vim-7.0-extra.tar.bz2 vim-7.0-fix_duplicate_key_assignment_de.patch vim-7.0-fstab_match_uuid.patch vim-7.0-lang.tar.bz2 vim-7.0-official_patches_001-243.bz2 vim-7.0.tar.bz2 New: ---- ANNOUNCEMENT.vim-7.1 vim-7.1-extra.tar.bz2 vim-7.1-lang.tar.bz2 vim-7.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vim.spec ++++++ --- /var/tmp/diff_new_pack.B16550/_old 2007-06-05 01:15:36.000000000 +0200 +++ /var/tmp/diff_new_pack.B16550/_new 2007-06-05 01:15:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package vim (Version 7.0) +# spec file for package vim (Version 7.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,18 +11,18 @@ # norootforbuild Name: vim -Version: 7.0 -Release: 72 +Version: 7.1 +Release: 1 # -License: Other uncritical OpenSource License +License: Other uncritical OpenSource License, http://vimdoc.sourceforge.net/htmldoc/uganda.html#license Group: Productivity/Editors/Vi # BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: db-devel gettext-devel gpm gtk2-devel libacl-devel ncurses-devel python-devel ruby-devel tcl-devel update-alternatives update-desktop-files # -%define pkg_version 7.0 +%define pkg_version 7.1 %define official_ptchlvl 243 -%define VIM_SUBDIR vim70 +%define VIM_SUBDIR vim71 # %define make make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/current MAKE="make -e" %{?jobs:-j%jobs} # @@ -64,7 +64,7 @@ Source16: gvim.png Source17: apparmor.vim Source18: missing-vim-client -Patch0: %{name}-7.0-official_patches_001-%{official_ptchlvl}.bz2 +#Patch0: %{name}-7.1-official_patches_001-%{official_ptchlvl}.bz2 Patch1: %{name}-7.0-no_nb.patch Patch3: %{name}-7.0-filetype_ycp.patch Patch4: %{name}-7.0-gvimrc_fontset.patch @@ -76,11 +76,9 @@ Patch10: %{name}-7.0-name_vimrc.patch Patch11: %{name}-7.0-mktemp_tutor.patch Patch12: %{name}-7.0-ruby_ldflags_configure.patch -Patch13: %{name}-7.0-fstab_match_uuid.patch Patch14: %{name}-7.0-grub.patch Patch15: %{name}-7.0-apparmor.patch Patch16: %{name}-7.0-flex-array.diff -Patch17: vim-7.0-fix_duplicate_key_assignment_de.patch # tbd??? %name-6.3-ga-utf8.diff # tbd??? %name-6.3-initvals.diff # tbd??? vim64-svn-crash.patch @@ -261,7 +259,7 @@ %prep %setup -q -n %{VIM_SUBDIR} -b 1 -b 2 -%patch +#%patch %patch1 -p1 %patch3 -p1 %patch4 -p1 @@ -273,11 +271,9 @@ %patch10 -p1 %patch11 -p1 %patch12 -p1 -%patch13 %patch14 %patch15 -p1 %patch16 -%patch17 -p1 cp %{S:3} %{S:4} %{S:5} %{S:6} %{S:8} %{S:9} %{S:10} . rename no nb $RPM_BUILD_DIR/vim*/src/po/no.* rename menu_no menu_nb $RPM_BUILD_DIR/vim*/runtime/lang/menu_no* @@ -396,7 +392,7 @@ %{__install} -d -m 0755 %{buildroot}%{_docdir}/{,g}vim/ %{__install} -D -m 0644 \ vimrc_example1 vimrc_example2 suse.vimrc \ - README.txt README_src.txt README_unix.txt README_lang.txt src/INSTALL ANNOUNCEMENT.vim-7.0 \ + README.txt README_src.txt README_unix.txt README_lang.txt src/INSTALL ANNOUNCEMENT.vim-7.1 \ %{buildroot}%{_docdir}/vim/ # gvim %{__install} -D -m 0644 \ @@ -541,6 +537,18 @@ %dir %{_datadir}/vim/%{VIM_SUBDIR}/syntax/ %dir %{_datadir}/vim/%{VIM_SUBDIR}/tools/ %dir %{_datadir}/vim/%{VIM_SUBDIR}/tutor/ +# +%{_datadir}/vim/%{VIM_SUBDIR}/bugreport.vim +%{_datadir}/vim/%{VIM_SUBDIR}/evim.vim +%{_datadir}/vim/%{VIM_SUBDIR}/filetype.vim +%{_datadir}/vim/%{VIM_SUBDIR}/ftoff.vim +%{_datadir}/vim/%{VIM_SUBDIR}/ftplugin.vim +%{_datadir}/vim/%{VIM_SUBDIR}/ftplugof.vim +%{_datadir}/vim/%{VIM_SUBDIR}/indent.vim +%{_datadir}/vim/%{VIM_SUBDIR}/indoff.vim +%{_datadir}/vim/%{VIM_SUBDIR}/optwin.vim +%{_datadir}/vim/%{VIM_SUBDIR}/scripts.vim +%{_datadir}/vim/%{VIM_SUBDIR}/syntax/syntax.vim # stupid helper # THIS BREAKS THE BUILD: %{_datadir}/vim/current/tools/missing-vim-client %{_datadir}/vim/%{VIM_SUBDIR}/tools/missing-vim-client @@ -561,6 +569,7 @@ %{_datadir}/vim/%{VIM_SUBDIR}/print/* %{_datadir}/vim/%{VIM_SUBDIR}/spell/* %{_datadir}/vim/%{VIM_SUBDIR}/syntax/* +%exclude %{_datadir}/vim/%{VIM_SUBDIR}/syntax/syntax.vim %{_datadir}/vim/%{VIM_SUBDIR}/tools/blink.c %{_datadir}/vim/%{VIM_SUBDIR}/tools/ccfilter.1 %{_datadir}/vim/%{VIM_SUBDIR}/tools/ccfilter.c @@ -582,20 +591,10 @@ %{_datadir}/vim/%{VIM_SUBDIR}/tools/vim_vs_net.cmd %{_datadir}/vim/%{VIM_SUBDIR}/tools/xcmdsrv_client.c %{_datadir}/vim/%{VIM_SUBDIR}/tutor/* -%{_datadir}/vim/%{VIM_SUBDIR}/bugreport.vim %{_datadir}/vim/%{VIM_SUBDIR}/delmenu.vim -%{_datadir}/vim/%{VIM_SUBDIR}/evim.vim -%{_datadir}/vim/%{VIM_SUBDIR}/filetype.vim -%{_datadir}/vim/%{VIM_SUBDIR}/ftoff.vim -%{_datadir}/vim/%{VIM_SUBDIR}/ftplugin.vim -%{_datadir}/vim/%{VIM_SUBDIR}/ftplugof.vim %{_datadir}/vim/%{VIM_SUBDIR}/gvimrc_example.vim -%{_datadir}/vim/%{VIM_SUBDIR}/indent.vim -%{_datadir}/vim/%{VIM_SUBDIR}/indoff.vim %{_datadir}/vim/%{VIM_SUBDIR}/menu.vim %{_datadir}/vim/%{VIM_SUBDIR}/mswin.vim -%{_datadir}/vim/%{VIM_SUBDIR}/optwin.vim -%{_datadir}/vim/%{VIM_SUBDIR}/scripts.vim %{_datadir}/vim/%{VIM_SUBDIR}/synmenu.vim %{_datadir}/vim/%{VIM_SUBDIR}/vimrc_example.vim @@ -635,6 +634,16 @@ %endif %changelog +* Wed May 23 2007 - mkoenig@suse.de +- update to version 7.1 +- removed patches: + vim-7.0-fstab_match_uuid.patch + vim-7.0-fix_duplicate_key_assignment_de.patch +- enable syntax highlighting by default [#274600] +* Tue May 15 2007 - mrueckert@suse.de +- move a few files back into the base package so we can e.g. enable + syntax highlighting by default. it would still be black/white + for most filetypes. * Wed May 09 2007 - mkoenig@suse.de - fix duplicate key assignment in dialog when .swp file exists [#270312] ++++++ vim-7.0-highlight_fstab.patch ++++++ --- /var/tmp/diff_new_pack.B16550/_old 2007-06-05 01:15:36.000000000 +0200 +++ /var/tmp/diff_new_pack.B16550/_new 2007-06-05 01:15:36.000000000 +0200 @@ -1,18 +1,22 @@ ---- vim70/runtime/syntax/fstab.vim.orig 2006-04-16 18:01:27.000000000 +0200 -+++ vim70/runtime/syntax/fstab.vim 2006-07-11 15:37:50.000000000 +0200 -@@ -26,6 +26,7 @@ - syn match fsDeviceError /%([^a-zA-Z0-9_/#@:]|^\w{-}\ze\W)/ contained - syn keyword fsDeviceKeyword contained none proc linproc tmpfs devpts sysfs usbfs +Index: vim71/runtime/syntax/fstab.vim +=================================================================== +--- vim71.orig/runtime/syntax/fstab.vim ++++ vim71/runtime/syntax/fstab.vim +@@ -28,7 +28,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 match fsDeviceKeyword /[a-z0-9_]*fs/ contained - syn match fsDeviceLabel contained /=[^ \t]+/hs=s+1 contains=fsOperator - - " Mount Point -@@ -37,6 +38,7 @@ + syn keyword fsDeviceKeyword contained UUID nextgroup=fsDeviceUUID + syn match fsDeviceKeyword contained /^[a-zA-Z0-9.-]+\ze:/ +@@ -43,7 +43,7 @@ syn keyword fsMountPointKeyword containe + " Type syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown syn match fsTypeUnknown /\s+\zs\w+/ contained - syn keyword fsTypeKeyword contained adfs affs atfs audiofs auto autofs befs bfs cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext3 fdesc hfs hpfs iso9660 jffs jffs2 jfs kernfs linprocfs mfs minix msdos ncpfs nfs none none ntfs null nwfs ovlfs portal proc procfs qnx4 reiserfs romfs shm smbfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs -+syn match fsTypeKeyword /[a-z0-9_]*fs/ 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 fdesc ffs filecore 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 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 cd9660 cfs cifs coda cramfs debugfs devfs devpts e2compr efs ext2 ext2fs ext3 fdesc ffs filecore 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 std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs " Options " ------- ++++++ vim-7.0-extra.tar.bz2 -> vim-7.1-extra.tar.bz2 ++++++ ++++ 4331 lines of diff (skipped) ++++++ vim-7.0-lang.tar.bz2 -> vim-7.1-lang.tar.bz2 ++++++ ++++ 3928 lines of diff (skipped) ++++++ vim-7.0-extra.tar.bz2 -> vim-7.1.tar.bz2 ++++++ vim/vim-7.0-extra.tar.bz2 /mounts/work_src_done/STABLE/vim/vim-7.1.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org