From 3b816e8c646835d86cddedc5ff35f795533ae01f Mon Sep 17 00:00:00 2001
From: Michel Lind <salimma@centosproject.org>
Date: Feb 28 2025 17:27:51 +0000
Subject: Revert "Make it build on el8"


This reverts commit 6b81bfdd57531db9af7c8761a4a36f46f88cc08e.

Signed-off-by: Michel Lind <salimma@centosproject.org>

---

diff --git a/disable-broken-doc-code.patch b/disable-broken-doc-code.patch
deleted file mode 100644
index 835bc7b..0000000
--- a/disable-broken-doc-code.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/doc_src/fish_synopsis.py b/doc_src/fish_synopsis.py
-index 51df271..a674902 100644
---- a/doc_src/fish_synopsis.py
-+++ b/doc_src/fish_synopsis.py
-@@ -23,9 +23,9 @@ class FishSynopsisDirective(CodeBlock):
-     required_arguments = 0
- 
-     def run(self):
--        if self.env.app.builder.name != "man":
--            self.arguments = ["fish-synopsis"]
--            return CodeBlock.run(self)
-+        # if self.env.app.builder.name != "man":
-+        #     self.arguments = ["fish-synopsis"]
-+        #     return CodeBlock.run(self)
-         lexer = FishSynopsisLexer()
-         result = nodes.line_block()
-         for (start, tok, text) in lexer.get_tokens_unprocessed("\n".join(self.content)):
diff --git a/fish.spec b/fish.spec
index 25a6076..6e6af23 100644
--- a/fish.spec
+++ b/fish.spec
@@ -5,7 +5,7 @@
 
 Name:           fish
 Version:        %{version_base}%{?gitnum:^%{gitnum}g%{githashshort}}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Friendly interactive shell
 # GPLv2
 #   - src/fish.cpp
@@ -36,13 +36,9 @@ Source2:        gpgkey-003837986104878835FA516D7A67D962D88A709A.gpg
 %else
 Source0:        https://github.com/fish-shell/fish-shell/archive/%{githash}/%{name}-%{githash}.tar.gz
 %endif
-%if 0%{?el8}
-# Disable sphinx logic that's incompatible with the version in el8
-Patch1:         disable-broken-doc-code.patch
-%endif
 %if 0%{?facebook}
 # Log history to syslog
-Patch2:         log-history-to-syslog.patch
+Patch:          log-history-to-syslog.patch
 %endif
 
 BuildRequires:  cmake >= 3.5
@@ -101,11 +97,7 @@ done
 
 # We still need to slightly manually adapt the pkgconfig file and remove
 # some /usr/local/ references (RHBZ#1869376)
-%if 0%{?el8}
-sed -i 's^/usr/local/^/usr/^g' *.pc
-%else
 sed -i 's^/usr/local/^/usr/^g' %{_vpath_builddir}/*.pc
-%endif
 
 %install
 %cmake_install
@@ -122,11 +114,7 @@ cp -a CONTRIBUTING.rst %{buildroot}%{_pkgdocdir}
 
 %check
 # Sadly, ctest is broken
-%if 0%{?el8}
-%ninja_build test
-%else
 %ninja_build -C %{_vpath_builddir} test
-%endif
 desktop-file-validate %{buildroot}%{_datadir}/applications/fish.desktop
 
 %post
@@ -158,6 +146,9 @@ fi
 %{_datadir}/pixmaps/fish.png
 
 %changelog
+* Fri Feb 28 2025 Michel Lind <salimma@centosproject.org> 3.5.1-3
+- Revert EL8 workaround, no longer needed
+
 * Tue Sep 06 2022 Davide Cavalca <dcavalca@centosproject.org> 3.5.1-2
 - Add missing disttag to Release