diff --git a/README.patches b/README.patches index ab21551..c114774 100644 --- a/README.patches +++ b/README.patches @@ -860,3 +860,6 @@ Individual patches for Vim 7.4: 1306 7.4.836 accessing unitinialized memory 1478 7.4.837 compiler warning with MSVC compiler when using +sniff 1820 7.4.838 (after 7.4.833) can't compile without the crypt feature + 1944 7.4.839 compiler warning on 64-bit system + 1482 7.4.840 (after 7.4.829) tooltip window stays open + 2380 7.4.841 can't compile without the multi-byte feature diff --git a/vim.spec b/vim.spec index 37fd621..7459a9f 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 838 +%define patchlevel 841 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -885,6 +885,9 @@ Patch835: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.835 Patch836: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.836 Patch837: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.837 Patch838: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.838 +Patch839: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.839 +Patch840: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.840 +Patch841: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.841 Patch1559: 7.4.559.rhpatched Patch3000: vim-7.4-syntax.patch @@ -1873,6 +1876,9 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch836 -p0 %patch837 -p0 %patch838 -p0 +%patch839 -p0 +%patch840 -p0 +%patch841 -p0 # install spell files %if %{withvimspell} @@ -2432,6 +2438,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/* %changelog +* Thu Aug 27 2015 Karsten Hopp 7.4.841-1 +- patchlevel 841 + * Wed Aug 26 2015 Karsten Hopp 7.4.838-1 - patchlevel 838