From 2f1f593c1f584fded501c30973dd40b70de8a2e3 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Apr 08 2019 10:34:24 +0000
Subject: 1697104 - new spec file template contains deprecated tags


---

diff --git a/spec-template b/spec-template
deleted file mode 100644
index a5363cc..0000000
--- a/spec-template
+++ /dev/null
@@ -1,42 +0,0 @@
-Name:		
-Version:	
-Release:	1%{?dist}
-Summary:	
-
-Group:		
-License:	
-URL:		
-Source0:	
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
-BuildRequires:	
-Requires:	
-
-%description
-
-
-%prep
-%setup -q
-
-
-%build
-%configure
-make %{?_smp_mflags}
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root,-)
-%doc
-
-
-
-%changelog
diff --git a/spec-template.new b/spec-template.new
index d995348..b248ecd 100644
--- a/spec-template.new
+++ b/spec-template.new
@@ -1,9 +1,14 @@
+# SPEC file overview:
+# https://docs.fedoraproject.org/en-US/quick-docs/creating-rpm-packages/#con_rpm-spec-file-overview
+# Fedora packaging guidelines:
+# https://docs.fedoraproject.org/en-US/packaging-guidelines/
+
+
 Name:		
 Version:	
-Release:	1%{?dist}
+Release:	0%{?dist}
 Summary:	
 
-Group:		
 License:	
 URL:		
 Source0:	
@@ -29,6 +34,7 @@ make %{?_smp_mflags}
 
 %files
 %doc
+%license
 
 
 
diff --git a/vim.spec b/vim.spec
index 42d415e..9d146a7 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: 1%{?dist}
+Release: 2%{?dist}
 License: Vim and MIT
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
 Source1: vim.sh
@@ -35,9 +35,8 @@ Source10: gvim64.png
 %if %{withvimspell}
 Source13: vim-spell-files.tar.bz2
 %endif
-Source14: spec-template
-Source15: spec-template.new
-Source16: macros.vim
+Source14: spec-template.new
+Source15: macros.vim
 #Source17: ftplugin-spec.vim
 #Source18: syntax-spec.vim
 
@@ -386,11 +385,7 @@ cp vim enhanced-vim
 mkdir -p %{buildroot}/%{_bindir}
 mkdir -p %{buildroot}/%{_datadir}/%{name}/vimfiles/{after,autoload,colors,compiler,doc,ftdetect,ftplugin,indent,keymap,lang,plugin,print,spell,syntax,tutor}
 mkdir -p %{buildroot}/%{_datadir}/%{name}/vimfiles/after/{autoload,colors,compiler,doc,ftdetect,ftplugin,indent,keymap,lang,plugin,print,spell,syntax,tutor}
-%if %{?fedora}%{!?fedora:0} >= 16 || %{?rhel}%{!?rhel:0} >= 6
-cp -f %{SOURCE15} %{buildroot}/%{_datadir}/%{name}/vimfiles/template.spec
-%else
 cp -f %{SOURCE14} %{buildroot}/%{_datadir}/%{name}/vimfiles/template.spec
-%endif
 cp runtime/doc/uganda.txt LICENSE
 # Those aren't Linux info files but some binary files for Amiga:
 rm -f README*.info
@@ -541,7 +536,7 @@ sed -i -e "s/augroup fedora/augroup redhat/" %{buildroot}/%{_sysconfdir}/virc
 %endif
 
 mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/
-install -p -m644 %{SOURCE16} %{buildroot}%{_rpmconfigdir}/macros.d/
+install -p -m644 %{SOURCE15} %{buildroot}%{_rpmconfigdir}/macros.d/
 
 (cd ../runtime; rm -rf doc; ln -svf ../../vim/%{vimdir}/doc docs;) 
 rm -f %{buildroot}/%{_datadir}/vim/%{vimdir}/macros/maze/maze*.c
@@ -799,6 +794,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Mon Apr 08 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1099-2
+- 1697104 - new spec file template contains deprecated tags
+
 * Tue Apr 02 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1099-1
 - patchlevel 1099