From cc2fb5c07c19c0347ee65002c8da50724d7f8b4e Mon Sep 17 00:00:00 2001 From: David Adam Date: Sat, 27 Apr 2024 18:07:00 +0800 Subject: [PATCH] fish.spec: drop RHEL/CentOS support Discussed on https://github.com/fish-shell/fish-shell/issues/10453 --- fish.spec.in | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/fish.spec.in b/fish.spec.in index cd05cb4ae..d645e66b2 100644 --- a/fish.spec.in +++ b/fish.spec.in @@ -25,17 +25,13 @@ BuildRequires: groff-base %endif # for tests -%if 0%{?fedora} || ( 0%{?rhel} && 0%{?rhel} > 7 ) +%if 0%{?fedora} # Need the en_US.utf-8 locale at a minimum BuildRequires: glibc-langpack-en %endif BuildRequires: python3 procps -%if 0%{?rhel} && 0%{?rhel} < 8 -Requires: python -%else Requires: python3 -%endif Requires: man # Although the build scripts mangle the version number to be RPM compatible @@ -59,11 +55,7 @@ is simple but incompatible with other shell languages. export CARGO_NET_OFFLINE=true # CMake macros define the wrong sysconfdir arguments EXTRA_CMAKE_FLAGS="$EXTRA_CMAKE_FLAGS -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} -DCMAKE_INSTALL_DOCDIR=%{_docdir}/fish" -%if 0%{?rhel} && 0%{?rhel} < 8 -%cmake3 $EXTRA_CMAKE_FLAGS -%else %cmake $EXTRA_CMAKE_FLAGS -%endif %if 0%{?cmake_build:1} %cmake_build %else