diff --git a/README.patches b/README.patches index a28c655..6548643 100644 --- a/README.patches +++ b/README.patches @@ -876,3 +876,10 @@ Individual patches for Vim 7.4: 16460 7.4.852 MS-Windows console cannot input/output Unicode characters 2377 7.4.853 "zt" in diff mode does not always work properly 2145 7.4.854 missing information about runtime files + 2113 7.4.855 GTK: font glitches for combining characters + 2405 7.4.856 "zt" still doesn't work well with filler lines + 1663 7.4.857 dragging the current tab with the mouse doesn't work properly + 39395 7.4.858 it's a bit clumsy to execute a command on a list of matches + 1653 7.4.859 Vim doesn't recognize all htmldjango files + 18401 7.4.860 filetype detection is outdated + 4357 7.4.861 (after 7.4.855) pango_shape_full() is not always available diff --git a/vim.spec b/vim.spec index 2b19f37..6f5d576 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 854 +%define patchlevel 861 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -901,6 +901,13 @@ Patch851: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.851 Patch852: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.852 Patch853: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.853 Patch854: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.854 +Patch855: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.855 +Patch856: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.856 +Patch857: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.857 +Patch858: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.858 +Patch859: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.859 +Patch860: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.860 +Patch861: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.861 Patch1559: 7.4.559.rhpatched Patch3000: vim-7.4-syntax.patch @@ -1905,6 +1912,13 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch852 -p0 %patch853 -p0 %patch854 -p0 +%patch855 -p0 +%patch856 -p0 +%patch857 -p0 +%patch858 -p0 +%patch859 -p0 +%patch860 -p0 +%patch861 -p0 # install spell files %if %{withvimspell} @@ -2464,6 +2478,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/* %changelog +* Wed Sep 09 2015 Karsten Hopp 7.4.861-1 +- patchlevel 861 + * Wed Sep 02 2015 Karsten Hopp 7.4.854-1 - patchlevel 854