From f783457ec2bcf6029079fd0d8a40ba9cc470d1cc Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 3 Nov 2017 16:45:52 +0100 Subject: [PATCH 1/2] - patchlevel 1257 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f362de2f..caca3723 100644 --- a/.gitignore +++ b/.gitignore @@ -134,3 +134,4 @@ /vim-8.0-1238.tar.bz2 /vim-8.0-1240.tar.bz2 /vim-8.0-1241.tar.bz2 +/vim-8.0-1257.tar.bz2 diff --git a/sources b/sources index b39ca2a9..eb302ecb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.0-1241.tar.bz2) = c3df065530cecd5b10384e00b0128b550ad3d40a496f5523cd91705af2c4d7122e3faa20c54f28e8af6cd0f2990873019c456044e103919d841674cc9cee3132 +SHA512 (vim-8.0-1257.tar.bz2) = bab4b48e0a80b251598aee3d4c872262167d82130c1ad529739f9c79dba38fa60857c909f740c9c13efd3402648438aa833f5410edfc2012b0e946d1dbf774b6 diff --git a/vim.spec b/vim.spec index 41991145..90327fd4 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1241 +%define patchlevel 1257 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -768,6 +768,9 @@ rm -rf %{buildroot} %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Nov 03 2017 Karsten Hopp 8.0.1257-1 +- patchlevel 1257 + * Wed Nov 01 2017 Karsten Hopp 8.0.1241-1 - patchlevel 1241 From e8dd2e297dc3e7c8356a976247b6f13a4fa41cb5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 3 Nov 2017 17:07:57 +0100 Subject: [PATCH 2/2] patchlevel 1257 --- vim-8.0-bindsyntax.patch | 12 ------------ vim.spec | 2 -- 2 files changed, 14 deletions(-) delete mode 100644 vim-8.0-bindsyntax.patch diff --git a/vim-8.0-bindsyntax.patch b/vim-8.0-bindsyntax.patch deleted file mode 100644 index e9c58279..00000000 --- a/vim-8.0-bindsyntax.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up vim80/runtime/filetype.vim.bindsyntax vim80/runtime/filetype.vim ---- vim80/runtime/filetype.vim.bindsyntax 2017-03-30 14:35:27.226674642 +0200 -+++ vim80/runtime/filetype.vim 2017-03-30 14:43:01.743145007 +0200 -@@ -289,7 +289,7 @@ au BufNewFile,BufRead *.bst setf bst - - " BIND configuration - " sudoedit uses namedXXXX.conf --au BufNewFile,BufRead named*.conf,rndc*.conf setf named -+au BufNewFile,BufRead named*.conf,rndc*.conf,rndc*.key setf named - - " BIND zone - au BufNewFile,BufRead named.root setf bindzone diff --git a/vim.spec b/vim.spec index 90327fd4..68c29077 100644 --- a/vim.spec +++ b/vim.spec @@ -63,7 +63,6 @@ Patch3012: vim-7.4-licensemacro-1151450.patch Patch3013: vim-7.4-globalsyntax.patch Patch3014: vim-7.4-releasestring-1318991.patch Patch3015: vim-8.0-copy-paste.patch -Patch3016: vim-8.0-bindsyntax.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel python3-devel ncurses-devel gettext perl-devel @@ -222,7 +221,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3013 -p1 %patch3014 -p1 %patch3015 -p1 -%patch3016 -p1 -b .bindsyntax %build cd src