Drop workarounds for F32 and EPEL

epel9
Benjamin A. Beasley 3 years ago
parent 0716f44ead
commit 90f2d3a3dd

@ -54,16 +54,11 @@ Source2: update-version
# chromium-84.0.4147.105-gn-gcc-cleanup.patch
Patch0: %{name}-39a87c0b-gcc-cleanup.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
@ -71,7 +66,7 @@ BuildRequires: parallel
BuildRequires: help2man
Requires: vim-filesystem
Requires: python%{python3_pkgversion}
Requires: python3
Provides: vim-%{name} = %{version}-%{release}
BuildRequires: emacs
@ -104,17 +99,12 @@ cp -vp misc/vim/README.md README-vim.md
# Fix shebangs in examples and such.
%py3_shebang_fix .
# On EPEL7, we would have to work around the missing py3_shebang_fix macro, but
# the package would not build anyway because it requires C++17 support.
# Stop overriding optimization flags
sed -r -i '/.append(.-O3.)/d' build/gen.py
%build
# We need to set CC and CXX explicitly before Fedora 33, including on the EPELs.
CC='gcc'; export CC
CXX='g++'; export CXX
AR='gcc-ar'; export AR
%set_build_flags
# Both --use-icf and --use-lto add compiler flags that only work with clang++,
@ -146,8 +136,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'
@ -155,11 +144,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

Loading…
Cancel
Save