- partial up to 7.4.022; few patches left as todo

diff --git a/vim-apache.patch b/vim-apache.patch
index 71ce2655509f6387528569ab4baa42c8d7fefcd2..fed385886015d1cdb2569efb8838c13f8df4eb06 100644 (file)
--- a/vim-apache.patch
+++ b/vim-apache.patch
@@ -1,11 +1,11 @@
 --- vim70/runtime/filetype.vim~        2006-05-13 15:24:24.000000000 +0200
 +++ vim70/runtime/filetype.vim 2006-05-15 10:02:34.491964500 +0200
-@@ -102,6 +102,8 @@
+@@ -110,6 +110,8 @@
  au BufNewFile,BufRead proftpd.conf*           call s:StarSetf('apachestyle')
  
  " Apache config file
 +au BufNewFile,BufRead */etc/httpd/*.conf,apache-*.conf,*-apache.conf  let apache_version="2.2" | setf apache
 +au BufNewFile,BufRead */etc/apache/*.conf,apache1-*.conf,*-apache1.conf       let apache_version="1.3" | setf apache
- 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')
+ au BufNewFile,BufRead .htaccess,*/etc/httpd/*.conf            setf apache
  
+ " XA65 MOS6510 cross assembler

diff --git a/vim-ft-cron.patch b/vim-ft-cron.patch
index 72d41810fac21192f26399b11e078cce4f36c6ba..6a86dde1651cb341e1c7a9bb7d307cd67043a6c0 100644 (file)
--- a/vim-ft-cron.patch
+++ b/vim-ft-cron.patch
@@ -1,11 +1,12 @@
 --- vim70/runtime/filetype.vim~        2006-11-15 15:36:16.000000000 +0200
 +++ vim70/runtime/filetype.vim 2006-12-22 20:30:52.336234386 +0200
-@@ -2070,7 +2070,7 @@
+@@ -2509,7 +2509,7 @@
        \|endif
  
  " Crontab
--au BufNewFile,BufRead crontab,crontab.*,/etc/cron.d/*         call s:StarSetf('crontab')
-+au BufNewFile,BufRead crontab,crontab.*,/etc/cron.d/*,*.cron,*.crond          call s:StarSetf('crontab')
+-au BufNewFile,BufRead crontab,crontab.*,*/etc/cron.d/*                call s:StarSetf('crontab')
++au BufNewFile,BufRead crontab,crontab.*,*/etc/cron.d/*,*.cron,*.crond call s:StarSetf('crontab')
  
- " Debian Sources.list
- au BufNewFile,BufRead /etc/apt/sources.list.d/*       call s:StarSetf('debsources')
+ " dnsmasq(8) configuration
+ au BufNewFile,BufRead */etc/dnsmasq.d/*               call s:StarSetf('dnsmasq')
+

diff --git a/vim-man_installation.patch b/vim-man_installation.patch
index 72dcb8d38c0a6cc5ed5c9429ed720c462d866b42..223107f585ff64d6aa6813a90977f8df83e79e38 100644 (file)
--- a/vim-man_installation.patch
+++ b/vim-man_installation.patch
@@ -119,19 +119,19 @@
        -$(SHELL) ./installman.sh uninstall $(DEST_MAN_RU_U) "" $(INSTALLMANARGS)
        -$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
                $(DEST_MAN) $(INSTALLMLARGS)
-@@ -2112,12 +2118,14 @@
-       -$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
+@@ -2307,12 +2307,14 @@
                $(DEST_MAN_RU) $(INSTALLMLARGS)
        -$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
-+              $(DEST_MAN_RU_K) $(INSTALLMLARGS)
-+      -$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
                $(DEST_MAN_RU_U) $(INSTALLMLARGS)
++      -$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
++              $(DEST_MAN_RU_K) $(INSTALLMLARGS)
        -rm -f $(DEST_MAN)/xxd.1
        -rm -f $(DEST_MAN_FR)/xxd.1 $(DEST_MAN_FR_I)/xxd.1 $(DEST_MAN_FR_U)/xxd.1
        -rm -f $(DEST_MAN_IT)/xxd.1 $(DEST_MAN_IT_I)/xxd.1 $(DEST_MAN_IT_U)/xxd.1
+       -rm -f $(DEST_MAN_JA_U)/xxd.1
        -rm -f $(DEST_MAN_PL)/xxd.1 $(DEST_MAN_PL_I)/xxd.1 $(DEST_MAN_PL_U)/xxd.1
 -      -rm -f $(DEST_MAN_RU)/xxd.1 $(DEST_MAN_RU_U)/xxd.1
-+      -rm -f $(DEST_MAN_RU)/xxd.1 $(DEST_MAN_RU_K)/xxd.1 $(DEST_MAN_RU_U)/xxd.1
++      -rm -f $(DEST_MAN_RU)/xxd.1 $(DEST_MAN_RU_U)/xxd.1 $(DEST_MAN_RU_K)/xxd.1
        -rm -f $(DEST_HELP)/*.txt $(DEST_HELP)/tags $(DEST_HELP)/*.pl
        -rm -f $(DEST_HELP)/*.??x $(DEST_HELP)/tags-??
        -rm -f $(SYS_MENU_FILE) $(SYS_SYNMENU_FILE) $(SYS_DELMENU_FILE)

diff --git a/vim-modprobe.patch b/vim-modprobe.patch
index 3ff8935b4391c119a2b3123583a2e294b9fdb276..5d8f3cd2f26538e39d70d1aacaff9541486c9fac 100644 (file)
--- a/vim-modprobe.patch
+++ b/vim-modprobe.patch
@@ -1,11 +1,12 @@
 --- runtime/filetype.vim~      2004-12-04 00:57:07.000000000 +0200
 +++ runtime/filetype.vim       2004-12-15 17:35:10.000000000 +0200
-@@ -846,7 +846,7 @@
+@@ -1216,7 +1216,7 @@
  au BufNewFile,BufRead *.moo                   setf moo
  
  " Modconf
--au BufNewFile,BufRead /etc/modules.conf,/etc/conf.modules     setf modconf
-+au BufNewFile,BufRead /etc/modules.conf,/etc/conf.modules,/etc/modprobe.conf  setf modconf
- au BufNewFile,BufRead /etc/modutils/*
-       \ if executable(expand("<afile>")) != 1 | setf modconf | endif
+-au BufNewFile,BufRead */etc/modules.conf,*/etc/modules,*/etc/conf.modules setf modconf
++au BufNewFile,BufRead */etc/modules.conf,*/etc/modules,*/etc/conf.modules,*/etc/modprobe.conf setf modconf
  
+ " Mplayer config
+ au BufNewFile,BufRead mplayer.conf,*/.mplayer/config  setf mplayerconf
+

diff --git a/vim-syntax-fstab.patch b/vim-syntax-fstab.patch
index 9233594570a6b53b35b4804978bdf91d179fcf5f..6b0d718881234318e382eb2d30ef05fc285305ff 100644 (file)
--- a/vim-syntax-fstab.patch
+++ b/vim-syntax-fstab.patch
@@ -1,13 +1,14 @@
-recognize btrfs, cpuset, ext4dev and reiser4
+recognize ext4dev and reiser4
 
 --- vim71/runtime/syntax/fstab.vim~    2007-05-13 08:59:42.255604785 +0200
 +++ vim71/runtime/syntax/fstab.vim     2007-05-13 10:01:25.786883411 +0200
-@@ -43,7 +43,7 @@
+@@ -53,7 +53,7 @@
  " 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 btrfs cd9660 cfs cifs coda cpuset cramfs 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 reiser4 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 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 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 reiser4 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
  
  " Options
  " -------
+

diff --git a/vim-syntax-sshconfig.patch b/vim-syntax-sshconfig.patch
deleted file mode 100644 (file)
index 26b85b8..0000000
--- a/vim-syntax-sshconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vim72/runtime/syntax/sshconfig.vim~        2006-03-05 22:55:08.000000000 +0100
-+++ vim72/runtime/syntax/sshconfig.vim 2010-02-26 20:30:51.000000000 +0100
-@@ -23,7 +23,7 @@
- syn case ignore
- 
- " Comments
--syn match sshconfigComment "#.*$" contains=sshconfigTodo
-+syn match sshconfigComment "^[[:space:]]*#.*$" contains=sshconfigTodo
- syn keyword sshconfigTodo TODO FIXME NOT contained
- 
- " Constants

diff --git a/vim.spec b/vim.spec
index 326222f090ab89474c5388ffefad2a555e8d54fd..ae08e13a644409215a4b19efa92983cca3a8177d 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -22,13 +22,13 @@
 %endif
 
 # Command to check for latest patch:
-# wget ftp://ftp.vim.org/pub/editors/vim/patches/7.3/MD5SUMS -O sources
+# wget ftp://ftp.vim.org/pub/editors/vim/patches/7.4/MD5SUMS -O sources
 # tail -n1 sources | awk '{print $2}'
 # VCS Commits: https://code.google.com/p/vim/source/browse/
 
-%define                ver             7.3
-%define                patchlevel      1314
-%define                rel             1
+%define                ver             7.4
+%define                patchlevel      022
+%define                rel             0.1
 Summary:       Vi IMproved - a Vi clone
 Summary(de.UTF-8):     VIsual editor iMproved
 Summary(es.UTF-8):     Editor visual incrementado
@@ -46,7 +46,7 @@ Epoch:                4
 License:       Charityware
 Group:         Applications/Editors/Vim
 Source0:       ftp://ftp.vim.org/pub/vim/unix/%{name}-%{ver}.tar.bz2
-# Source0-md5: 5b9510a17074e2b37d8bb38ae09edbf2
+# Source0-md5: 607e135c559be642f210094ad023dc65
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: bc4d1e115ca506ad7751b9bd2b773a7f
 Source2:       http://skawina.eu.org/mikolaj/usr_doc_pl.zip
@@ -96,7 +96,7 @@ Patch21:      %{name}-filetypes.patch
 Patch22:       %{name}-man_installation.patch
 Patch23:       %{name}-vimrc.patch
 Patch24:       %{name}-syntax-exports.patch
-Patch25:       %{name}-syntax-sshconfig.patch
+
 Patch102:      %{name}-gtkfilechooser.patch
 Patch104:      %{name}-home_etc.patch
 Patch105:      %{name}-autopaste.patch
@@ -697,7 +697,7 @@ zawierającą obsługę skryptów w językach Perl, Python, Ruby oraz Tcl
 jak również GUI GTK+2.
 
 %prep
-%setup -q -n %{name}73
+%setup -q -n %{name}74
 
 # official patches
 %patchset_patch 1 %{patchlevel}
@@ -714,9 +714,11 @@ jak również GUI GTK+2.
 %patch9 -p0
 %patch10 -p1
 %patch11 -p1
+# FIXME
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+# FIXME
 %patch15 -p1
 %patch16 -p0
 %patch17 -p0
@@ -725,9 +727,9 @@ jak również GUI GTK+2.
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+# FIXME
 %patch23 -p1
 %patch24 -p1
-%patch25 -p1
 
 # home etc
 %{?with_home_etc:%patch104 -p1}
@@ -739,6 +741,7 @@ jak również GUI GTK+2.
 %patch106 -p1
 
 %patch108 -p1
+# FIXME
 %patch109 -p1
 %patch110 -p1
 %patch112 -p1