From ff5f0cc59d41b327093f673720938be46cb2bd61 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Fri, 19 Jul 2019 07:45:17 +0200
Subject: [PATCH] 1724126 - disable showing spec template for new file with
 .spec suffix minor changes in spec.template - tabs->spaces

---
 spec-template.new | 18 +++++++++---------
 vim.spec          |  6 +++++-
 vimrc             |  5 ++++-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/spec-template.new b/spec-template.new
index b248ecdb..2a558fb7 100644
--- a/spec-template.new
+++ b/spec-template.new
@@ -4,17 +4,17 @@
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/
 
 
-Name:		
-Version:	
-Release:	0%{?dist}
-Summary:	
+Name:
+Version:
+Release: 0%{?dist}
+Summary:
 
-License:	
-URL:		
-Source0:	
+License:
+URL:
+Source0:
 
-BuildRequires:	
-Requires:	
+BuildRequires:
+Requires:
 
 %description
 
diff --git a/vim.spec b/vim.spec
index 8048aad1..1ff46935 100644
--- a/vim.spec
+++ b/vim.spec
@@ -21,7 +21,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Vim and MIT
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
 Source1: vim.sh
@@ -790,6 +790,10 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Fri Jul 19 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1713-3
+- 1724126 - disable showing spec template for new file with .spec suffix
+- minor changes in spec.template - tabs->spaces
+
 * Fri Jul 19 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1713-2
 - remove skip_defaults_vim - it does not make sense to have it in system vimrc
 
diff --git a/vimrc b/vimrc
index a2e65d64..be4d3cfc 100644
--- a/vimrc
+++ b/vimrc
@@ -61,7 +61,10 @@ if has("autocmd")
   " don't write swapfile on most commonly used directories for NFS mounts or USB sticks
   autocmd BufNewFile,BufReadPre /media/*,/run/media/*,/mnt/* set directory=~/tmp,/var/tmp,/tmp
   " start with spec file template
-  autocmd BufNewFile *.spec 0r /usr/share/vim/vimfiles/template.spec
+  " 1724126 - do not open new file with .spec suffix with spec file template
+  " apparently there are other file types with .spec suffix, so disable the
+  " template
+  " autocmd BufNewFile *.spec 0r /usr/share/vim/vimfiles/template.spec
   augroup END
 endif