From c3c8cf1e01d7145e48b120a82ffedf0b168a9920 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sun, 10 Jul 2022 10:43:13 +0800
Subject: [PATCH] fish.spec: depend on system pcre2 libraries on all platforms

These are now available on all supported platforms, and the download
process tends to break on build workers (where Internet access is
deliberately denied).
---
 fish.spec.in | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/fish.spec.in b/fish.spec.in
index e4b9bbf29..cacacb41a 100644
--- a/fish.spec.in
+++ b/fish.spec.in
@@ -9,12 +9,12 @@ Group:                  System/Shells
 URL:                    https://fishshell.com/
 
 Source0:                %{name}_@VERSION@.orig.tar.xz
-BuildRequires:          ncurses-devel gettext gcc-c++ xz
+BuildRequires:          ncurses-devel gettext gcc-c++ xz pcre2-devel
 
 %if 0%{?rhel} && 0%{?rhel} < 8
 BuildRequires: cmake3
 %else
-BuildRequires: cmake pcre2-devel
+BuildRequires: cmake
 %endif
 
 %if 0%{?suse_version}
@@ -53,9 +53,6 @@ is simple but incompatible with other shell languages.
 %setup -q -n %{name}-@VERSION@
 
 %build
-# CMake macros define -DBUILD_SHARED_LIBS:BOOL=ON, which breaks the
-# bundled PCRE2 static library.
-EXTRA_CMAKE_FLAGS="$EXTRA_CMAKE_FLAGS -DBUILD_SHARED_LIBS:BOOL=OFF"
 # CMake macros define the wrong sysconfdir arguments
 EXTRA_CMAKE_FLAGS="$EXTRA_CMAKE_FLAGS -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir}"
 %if 0%{?rhel} && 0%{?rhel} < 8