- updated to 8.1.1004

diff --git a/vim-apache.patch b/vim-apache.patch
index 11fcf708618b479652cb90214f635ace03e3b55c..6b401a926ad70b85ace11f5b44e65aa5429544da 100644 (file)
--- a/vim-apache.patch
+++ b/vim-apache.patch
@@ -1,10 +1,11 @@
 --- vim74/runtime/filetype.vim~        2013-09-06 00:03:38.000000000 +0300
 +++ vim74/runtime/filetype.vim 2013-09-06 00:04:54.205952274 +0300
-@@ -110,7 +110,8 @@
+@@ -110,8 +110,8 @@
  au BufNewFile,BufRead proftpd.conf*           call s:StarSetf('apachestyle')
  
  " Apache config file
 -au BufNewFile,BufRead .htaccess,*/etc/httpd/*.conf            setf apache
+-au BufNewFile,BufRead */etc/apache2/sites-*/*.com             setf apache
 +au BufNewFile,BufRead .htaccess,*/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
  

diff --git a/vim-home_etc.patch b/vim-home_etc.patch
index 20c40b1262847190c754c50f3dfc9f63b2db0e1c..80d89a4d50f67b021521f0db24d9bbce08c3d534 100644 (file)
--- a/vim-home_etc.patch
+++ b/vim-home_etc.patch
@@ -69,16 +69,21 @@ diff -Nru vim62.orig/src/misc1.c vim62/src/misc1.c
  # endif
  #endif
  
-@@ -370,10 +370,10 @@ typedef struct dsc$descriptor   DESC;
- #else
+@@ -371,14 +371,14 @@
  # ifdef RUNTIME_GLOBAL
- #  define DFLT_RUNTIMEPATH    "~/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,~/.vim/after"
--#  define CLEAN_RUNTIMEPATH   RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after"
-+#  define CLEAN_RUNTIMEPATH   "$HOME_ETC/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,$HOME_ETC/.vim/after"
+ #  ifdef RUNTIME_GLOBAL_AFTER
+ #   define DFLT_RUNTIMEPATH   "~/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER ",~/.vim/after"
+-#   define CLEAN_RUNTIMEPATH  RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER
++#   define CLEAN_RUNTIMEPATH  "$HOME_ETC/.vim/after," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER
+ #  else
+ #   define DFLT_RUNTIMEPATH   "~/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,~/.vim/after"
+-#   define CLEAN_RUNTIMEPATH  RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after"
++#   define CLEAN_RUNTIMEPATH  "$HOME_ETC/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after"
+ #  endif
  # else
  #  define DFLT_RUNTIMEPATH    "~/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/.vim/after"
 -#  define CLEAN_RUNTIMEPATH   "$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after"
-+#  define CLEAN_RUNTIMEPATH   "$HOME_ETC/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$HOME_ETC/.vim/after"
++#  define CLEAN_RUNTIMEPATH   "$HOME_ETC/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after"
  # endif
  #endif
  

diff --git a/vim.spec b/vim.spec
index 1a6b5040d2129b1f320bc2c2cfa7977b8d591ce7..9509a807592e672154daa036c64c4fdc9370bb99 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -29,7 +29,7 @@
 # wget ftp://ftp.vim.org/pub/editors/vim/patches/8.0/MD5SUMS -O - | tail -n1 | awk '{print $2}'
 # VCS Commits: https://github.com/vim/vim/commits/master
 
-%define                ver             8.1.0553
+%define                ver             8.1.1004
 %define                rel             1
 Summary:       Vi IMproved - a Vi clone
 Summary(de.UTF-8):     VIsual editor iMproved
@@ -50,7 +50,7 @@ License:      Charityware
 Group:         Applications/Editors/Vim
 #Source0:      ftp://ftp.vim.org/pub/vim/unix/%{name}-%{ver}.tar.bz2
 Source0:       https://github.com/vim/vim/archive/v%{ver}.tar.gz
-# Source0-md5: 1044b882deff51fd2d787787d7c8f876
+# Source0-md5: d99303e1be389eb550a4f66e35047909
 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