From 3338d02f36ecdb546389f5d34e8746bca36e8bf8 Mon Sep 17 00:00:00 2001
From: Carl George <carl@george.computer>
Date: May 28 2021 04:10:09 +0000
Subject: Build against system uthash


---

diff --git a/the_silver_searcher.spec b/the_silver_searcher.spec
index 79a068c..bd7cb66 100644
--- a/the_silver_searcher.spec
+++ b/the_silver_searcher.spec
@@ -22,15 +22,13 @@ BuildRequires:  automake
 BuildRequires:  pcre-devel
 BuildRequires:  xz-devel
 BuildRequires:  zlib-devel
+BuildRequires:  uthash-devel
 %if %{with tests}
 BuildRequires:  python3-cram
 BuildRequires:  git-core
 %endif
 
 Provides:       ag
-# TODO: unbundle src/uthash.h and build require uthash-devel
-# https://github.com/ggreer/the_silver_searcher/issues/1411
-Provides:       bundled(uthash)
 
 
 %description
@@ -41,6 +39,10 @@ with a focus on speed.
 %prep
 %autosetup -n %{name}-%{commit} -p 1
 
+# https://github.com/ggreer/the_silver_searcher/issues/1411
+rm src/uthash.h
+sed -e '/ag_SOURCES/ s/ src\/uthash.h//' -i Makefile.am
+
 
 %build
 aclocal
@@ -73,6 +75,7 @@ make test
 %changelog
 * Fri May 28 2021 Carl George <carl@george.computer> - 2.2.0^2020704.5a1c8d8-1
 - Switch to caret versioning
+- Build against system uthash
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild