From e23ab353032318ceb5afa99c191c3a3b230daa3e Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 20 Jul 2021 16:51:11 -0400
Subject: [PATCH] Drop workarounds for F32 and EPEL7

---
 gn.spec | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/gn.spec b/gn.spec
index 74efde3..49e84e8 100644
--- a/gn.spec
+++ b/gn.spec
@@ -55,16 +55,11 @@ Patch0:         %{name}-39a87c0b-gcc-cleanup.patch
 # Stop overriding optimization flags
 Patch1:         %{name}-0153d369-no-O3.patch
 
-# The python3_pkgversion macro is required for EPEL; see
-# https://fedoraproject.org/wiki/PackagingDrafts:Python3EPEL. On Fedora (and
-# EPEL8) it simply expands to “3”.
-BuildRequires:  python%{python3_pkgversion}
-BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python3
+BuildRequires:  python3-devel
 BuildRequires:  ninja-build
 BuildRequires:  gcc-c++
 
-BuildRequires:  /usr/bin/pathfix.py
-
 %if %{with html_docs}
 BuildRequires:  pandoc
 BuildRequires:  parallel
@@ -72,7 +67,7 @@ BuildRequires:  parallel
 BuildRequires:  help2man
 
 Requires:       vim-filesystem
-Requires:       python%{python3_pkgversion}
+Requires:       python3
 Provides:       vim-%{name} = %{version}-%{release}
 
 BuildRequires:  emacs
@@ -145,8 +140,7 @@ help2man \
 
 
 %install
-install -d '%{buildroot}%{_bindir}'
-install -t '%{buildroot}%{_bindir}' -p out/%{name}
+install -t '%{buildroot}%{_bindir}' -D -p out/%{name}
 
 install -d '%{buildroot}%{_datadir}/vim/vimfiles'
 cp -vrp misc/vim/* '%{buildroot}%{_datadir}/vim/vimfiles'
@@ -154,11 +148,9 @@ find '%{buildroot}%{_datadir}/vim/vimfiles' \
     -type f -name 'README.*' -print -delete
 %py_byte_compile %{__python3} '%{buildroot}%{_datadir}/vim/vimfiles/%{name}-format.py'
 
-install -d '%{buildroot}%{_emacs_sitestartdir}'
-install -t '%{buildroot}%{_emacs_sitestartdir}' -p -m 0644 misc/emacs/*.el
+install -t '%{buildroot}%{_emacs_sitestartdir}' -D -p -m 0644 misc/emacs/*.el
 
-install -d '%{buildroot}%{_mandir}/man1'
-install -t '%{buildroot}%{_mandir}/man1' -m 0644 -p out/%{name}.1
+install -t '%{buildroot}%{_mandir}/man1' -D -m 0644 -p out/%{name}.1
 
 
 %check