From 71ff40d0adfa0dac8ec6302ca728421fe35b589d Mon Sep 17 00:00:00 2001
From: Siteshwar Vashisht <svashisht@redhat.com>
Date: Jan 31 2023 14:08:14 +0000
Subject: [PATCH 2/17] Update to 3.6.0


Resolves: #2159099

---

diff --git a/fish.spec b/fish.spec
index 835fa04..ec4f5c0 100644
--- a/fish.spec
+++ b/fish.spec
@@ -1,4 +1,4 @@
-%global version_base 3.5.1
+%global version_base 3.6.0
 #global gitnum 120
 #global githash 1a0b1ae238e1deb132a0ae4a8d0c589d583cc5b0
 #global githashshort %{lua:print(string.sub(rpm.expand('%{githash}'), 1, 11))}
@@ -74,7 +74,6 @@ nothing to learn or configure.
 %if %{defined gitnum}
 echo "%{version_base}-%{gitnum}g%{githashshort}" > version
 %endif
-rm -vr pcre2*
 
 # Change the bundled scripts to invoke the python binary directly.
 for f in $(find share/tools -type f -name '*.py'); do
diff --git a/sources b/sources
index e6e05bb..e942329 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (fish-3.5.1.tar.xz) = 328e3d972f9e7cffe161515540f00a97c5cbe11b43ec293090bedb96a6a8e689e07ceafecb3efcd0e378edea59811adb0acc011d5885ac28d98838387c678235
-SHA512 (fish-3.5.1.tar.xz.asc) = 8d1768fa46b37d4664a4007a8e81b197d2039463b9a8a163a486bb433017b65d4b9c7e9eebb7038f4258046b2ba59208d9253cd7dd050104670e169c4da1a877
+SHA512 (fish-3.6.0.tar.xz) = a11ea761adace02ef7f88b25893328005cef07f92d362fbc794540dca26e9cfc970878d0312caebd19d64483e9f3c3e24ad6c27dfce264d177f93d65c7ef6996
+SHA512 (fish-3.6.0.tar.xz.asc) = 262f0fb0d93a88f769a2c73377b1f5fd3be23a3a79a73e825ca5a9553836e8100fc89115d626d4981305b8427111f95d6e0143c473ebd2cc2d02167f3a921a01

From 75a14f782187242dd1c8a3a8fc32c6adcd5092f7 Mon Sep 17 00:00:00 2001
From: Siteshwar Vashisht <svashisht@fedoraproject.org>
Date: Jan 31 2023 14:23:10 +0000
Subject: [PATCH 3/17] Merge #13 `Update to 3.6.0`


---

diff --git a/fish.spec b/fish.spec
index 835fa04..ec4f5c0 100644
--- a/fish.spec
+++ b/fish.spec
@@ -1,4 +1,4 @@
-%global version_base 3.5.1
+%global version_base 3.6.0
 #global gitnum 120
 #global githash 1a0b1ae238e1deb132a0ae4a8d0c589d583cc5b0
 #global githashshort %{lua:print(string.sub(rpm.expand('%{githash}'), 1, 11))}
@@ -74,7 +74,6 @@ nothing to learn or configure.
 %if %{defined gitnum}
 echo "%{version_base}-%{gitnum}g%{githashshort}" > version
 %endif
-rm -vr pcre2*
 
 # Change the bundled scripts to invoke the python binary directly.
 for f in $(find share/tools -type f -name '*.py'); do
diff --git a/sources b/sources
index e6e05bb..e942329 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (fish-3.5.1.tar.xz) = 328e3d972f9e7cffe161515540f00a97c5cbe11b43ec293090bedb96a6a8e689e07ceafecb3efcd0e378edea59811adb0acc011d5885ac28d98838387c678235
-SHA512 (fish-3.5.1.tar.xz.asc) = 8d1768fa46b37d4664a4007a8e81b197d2039463b9a8a163a486bb433017b65d4b9c7e9eebb7038f4258046b2ba59208d9253cd7dd050104670e169c4da1a877
+SHA512 (fish-3.6.0.tar.xz) = a11ea761adace02ef7f88b25893328005cef07f92d362fbc794540dca26e9cfc970878d0312caebd19d64483e9f3c3e24ad6c27dfce264d177f93d65c7ef6996
+SHA512 (fish-3.6.0.tar.xz.asc) = 262f0fb0d93a88f769a2c73377b1f5fd3be23a3a79a73e825ca5a9553836e8100fc89115d626d4981305b8427111f95d6e0143c473ebd2cc2d02167f3a921a01

From bb4138d6b74e6db0a0b53525c6babe23bcaf1017 Mon Sep 17 00:00:00 2001
From: Siteshwar Vashisht <svashisht@redhat.com>
Date: Apr 10 2023 05:15:08 +0000
Subject: [PATCH 4/17] Update to 3.6.1


Resolves: #2181747

---

diff --git a/fish.spec b/fish.spec
index ec4f5c0..5855217 100644
--- a/fish.spec
+++ b/fish.spec
@@ -1,4 +1,4 @@
-%global version_base 3.6.0
+%global version_base 3.6.1
 #global gitnum 120
 #global githash 1a0b1ae238e1deb132a0ae4a8d0c589d583cc5b0
 #global githashshort %{lua:print(string.sub(rpm.expand('%{githash}'), 1, 11))}
diff --git a/sources b/sources
index e942329..bb28e4b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (fish-3.6.0.tar.xz) = a11ea761adace02ef7f88b25893328005cef07f92d362fbc794540dca26e9cfc970878d0312caebd19d64483e9f3c3e24ad6c27dfce264d177f93d65c7ef6996
-SHA512 (fish-3.6.0.tar.xz.asc) = 262f0fb0d93a88f769a2c73377b1f5fd3be23a3a79a73e825ca5a9553836e8100fc89115d626d4981305b8427111f95d6e0143c473ebd2cc2d02167f3a921a01
+SHA512 (fish-3.6.1.tar.xz) = ee6f5c7699307d515f111c8c4f1633d9eb9703e045a93cfc2fcec722a03cca4ab25e4e09f6fd94ff2d07180d8b37c6ab733323bb2645065fdeb4e94771347597
+SHA512 (fish-3.6.1.tar.xz.asc) = e78334f5f1b95cd7e4b35dcd2b0398f8020847b04ef015d279b160f8248367b9a432f4beeb233dba5a59e99b7ed86cbd4a2b247849484674ff73bd243a36a243

From 37040582558dd8ecb2b79268a72dbae40f99251c Mon Sep 17 00:00:00 2001
From: Dan Čermák <dan.cermak@cgc-instruments.com>
Date: Dec 05 2023 15:59:00 +0000
Subject: [PATCH 6/17] Use proper rpm comments to prevent macro expansion


---

diff --git a/fish.spec b/fish.spec
index 5855217..31213cf 100644
--- a/fish.spec
+++ b/fish.spec
@@ -1,7 +1,7 @@
 %global version_base 3.6.1
-#global gitnum 120
-#global githash 1a0b1ae238e1deb132a0ae4a8d0c589d583cc5b0
-#global githashshort %{lua:print(string.sub(rpm.expand('%{githash}'), 1, 11))}
+%dnl %global gitnum 120
+%dnl %global githash 1a0b1ae238e1deb132a0ae4a8d0c589d583cc5b0
+%dnl %global githashshort %{lua:print(string.sub(rpm.expand('%{githash}'), 1, 11))}
 
 Name:           fish
 Version:        %{version_base}%{?gitnum:^%{gitnum}g%{githashshort}}

From 17af59929a43a8bc4bc732c8ec0916b38588b121 Mon Sep 17 00:00:00 2001
From: Dan Čermák <dan.cermak@cgc-instruments.com>
Date: Dec 06 2023 15:14:49 +0000
Subject: [PATCH 7/17] Switch license identifier to SPDX and add missing PSF-2.0


---

diff --git a/fish.spec b/fish.spec
index 31213cf..79d40ec 100644
--- a/fish.spec
+++ b/fish.spec
@@ -7,11 +7,12 @@ Name:           fish
 Version:        %{version_base}%{?gitnum:^%{gitnum}g%{githashshort}}
 Release:        %autorelease
 Summary:        Friendly interactive shell
+# see also doc_src/license.rst
 # GPLv2
 #   - src/fish.cpp
 #   and rest…
 # GPLv2+
-#   - src/builtin_printf.cpp
+#   - src/builtins/printf.cpp
 # BSD
 #   - src/fallback.cpp
 #   - share/tools/create_manpage_completions.py
@@ -27,7 +28,9 @@ Summary:        Friendly interactive shell
 #   - share/tools/web_config/js/angular-route.js
 #   - share/tools/web_config/js/angular-sanitize.js
 #   - share/tools/web_config/js/angular.js
-License:        GPLv2 and BSD and ISC and LGPLv2+ and MIT
+# PSF-2.0
+#   - doc_src/python_docs_theme/,
+License:        GPL-2.0-only AND AND BSD-3-Clause AND ISC AND LGPL-2.0-or-later AND MIT AND PSF-2.0
 URL:            https://fishshell.com
 %if %{undefined gitnum}
 Source0:        https://github.com/fish-shell/fish-shell/releases/download/%{version}/%{name}-%{version}.tar.xz

From fabd25f66f0678ad073e26a400f38d174cd15671 Mon Sep 17 00:00:00 2001
From: Dan Čermák <dan.cermak@cgc-instruments.com>
Date: Dec 06 2023 15:14:49 +0000
Subject: [PATCH 8/17] New upstream release 3.6.4, fixes rhbz#2252773


---

diff --git a/fish.spec b/fish.spec
index 79d40ec..fe55543 100644
--- a/fish.spec
+++ b/fish.spec
@@ -1,4 +1,4 @@
-%global version_base 3.6.1
+%global version_base 3.6.4
 %dnl %global gitnum 120
 %dnl %global githash 1a0b1ae238e1deb132a0ae4a8d0c589d583cc5b0
 %dnl %global githashshort %{lua:print(string.sub(rpm.expand('%{githash}'), 1, 11))}
diff --git a/sources b/sources
index bb28e4b..3366433 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (fish-3.6.1.tar.xz) = ee6f5c7699307d515f111c8c4f1633d9eb9703e045a93cfc2fcec722a03cca4ab25e4e09f6fd94ff2d07180d8b37c6ab733323bb2645065fdeb4e94771347597
-SHA512 (fish-3.6.1.tar.xz.asc) = e78334f5f1b95cd7e4b35dcd2b0398f8020847b04ef015d279b160f8248367b9a432f4beeb233dba5a59e99b7ed86cbd4a2b247849484674ff73bd243a36a243
+SHA512 (fish-3.6.4.tar.xz) = 0ab777d8ee87c9039a5d2abb71f175025a05c5aa0a0813d87f875e9975038a395cceebeedb5a8909d43ba06825ec1d15500fcdc9d784c424ce1dc86272703780
+SHA512 (fish-3.6.4.tar.xz.asc) = bd687ec51ac3a71531bb57fd71375895dd6c89e5400f2358171353c100f979f4ece073d991d5586fa616f1cb19dafa388eb2e7a602da4c397b384505d6abdb80

From f7bb2192d9933ed9170eb0aa483496bef965dc17 Mon Sep 17 00:00:00 2001
From: Dan Čermák <dan.cermak@cgc-instruments.com>
Date: Dec 11 2023 10:46:41 +0000
Subject: [PATCH 9/17] Remove duplicate AND from License tag


---

diff --git a/fish.spec b/fish.spec
index fe55543..6b6c445 100644
--- a/fish.spec
+++ b/fish.spec
@@ -30,7 +30,7 @@ Summary:        Friendly interactive shell
 #   - share/tools/web_config/js/angular.js
 # PSF-2.0
 #   - doc_src/python_docs_theme/,
-License:        GPL-2.0-only AND AND BSD-3-Clause AND ISC AND LGPL-2.0-or-later AND MIT AND PSF-2.0
+License:        GPL-2.0-only AND BSD-3-Clause AND ISC AND LGPL-2.0-or-later AND MIT AND PSF-2.0
 URL:            https://fishshell.com
 %if %{undefined gitnum}
 Source0:        https://github.com/fish-shell/fish-shell/releases/download/%{version}/%{name}-%{version}.tar.xz

From 3f5fc3b029de157467b66e088ca6e3fe3be62d4a Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Jan 02 2024 00:29:20 +0000
Subject: [PATCH 10/17] New upstream release 3.7.0 (Resolves: rhbz#2256375)


---

diff --git a/fish.spec b/fish.spec
index 6b6c445..4b1ed36 100644
--- a/fish.spec
+++ b/fish.spec
@@ -1,4 +1,4 @@
-%global version_base 3.6.4
+%global version_base 3.7.0
 %dnl %global gitnum 120
 %dnl %global githash 1a0b1ae238e1deb132a0ae4a8d0c589d583cc5b0
 %dnl %global githashshort %{lua:print(string.sub(rpm.expand('%{githash}'), 1, 11))}
diff --git a/sources b/sources
index 3366433..e44311d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (fish-3.6.4.tar.xz) = 0ab777d8ee87c9039a5d2abb71f175025a05c5aa0a0813d87f875e9975038a395cceebeedb5a8909d43ba06825ec1d15500fcdc9d784c424ce1dc86272703780
-SHA512 (fish-3.6.4.tar.xz.asc) = bd687ec51ac3a71531bb57fd71375895dd6c89e5400f2358171353c100f979f4ece073d991d5586fa616f1cb19dafa388eb2e7a602da4c397b384505d6abdb80
+SHA512 (fish-3.7.0.tar.xz) = bc5121ddd2a9918befac197b215721f20b69984897ec57558bef8e3a36a849935f6d1ec1c74c2d92e565f23e417039d7130122549c8b1d8c55dd8dbfb51a2d34
+SHA512 (fish-3.7.0.tar.xz.asc) = c4e922fe4ddffbf6172234e07708e8b88ba105cae235da27ca3e0d8a62e26107ffe7bac540bc08742915dc87c0d70bd45fcae8f8c7ea94a8ef570b1798e167e6

From d75003a2ea4cd6ba3aad26e8a17e3e245a80f50e Mon Sep 17 00:00:00 2001
From: ErrorNoInternet <errornointernet@envs.net>
Date: Jul 27 2024 03:44:03 +0000
Subject: [PATCH 14/17] New upstream release 3.7.1 (fixes rhbz#2270247)


---

diff --git a/fish.spec b/fish.spec
index 4b1ed36..270cf3a 100644
--- a/fish.spec
+++ b/fish.spec
@@ -1,4 +1,4 @@
-%global version_base 3.7.0
+%global version_base 3.7.1
 %dnl %global gitnum 120
 %dnl %global githash 1a0b1ae238e1deb132a0ae4a8d0c589d583cc5b0
 %dnl %global githashshort %{lua:print(string.sub(rpm.expand('%{githash}'), 1, 11))}
diff --git a/sources b/sources
index e44311d..48d8062 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (fish-3.7.0.tar.xz) = bc5121ddd2a9918befac197b215721f20b69984897ec57558bef8e3a36a849935f6d1ec1c74c2d92e565f23e417039d7130122549c8b1d8c55dd8dbfb51a2d34
-SHA512 (fish-3.7.0.tar.xz.asc) = c4e922fe4ddffbf6172234e07708e8b88ba105cae235da27ca3e0d8a62e26107ffe7bac540bc08742915dc87c0d70bd45fcae8f8c7ea94a8ef570b1798e167e6
+SHA512 (fish-3.7.1.tar.xz) = f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe
+SHA512 (fish-3.7.1.tar.xz.asc) = 924c51ead82ded38c6d2a91dae4ff568759cde30e023c2520d329d49ef163bc97e30274872b9325a9fdd591964106dd1e524fa429156d500338fe1d84d0739a6

From 3b816e8c646835d86cddedc5ff35f795533ae01f Mon Sep 17 00:00:00 2001
From: Michel Lind <salimma@centosproject.org>
Date: Feb 28 2025 17:27:51 +0000
Subject: [PATCH 15/17] 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
 

From e23c3de637eb29e52928adbbf58ad3d5f0d589a9 Mon Sep 17 00:00:00 2001
From: Michel Lind <salimma@centosproject.org>
Date: Feb 28 2025 17:28:06 +0000
Subject: [PATCH 16/17] Convert to %autorelease and %autochangelog


[skip changelog]
---

diff --git a/changelog b/changelog
new file mode 100644
index 0000000..38357cd
--- /dev/null
+++ b/changelog
@@ -0,0 +1,371 @@
+* 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
+
+* Tue Sep 06 2022 Davide Cavalca <dcavalca@centosproject.org> 3.5.1-2
+- Add Facebook internal patch to log history to syslog
+
+* Tue Sep 06 2022 Davide Cavalca <dcavalca@centosproject.org> 3.5.1-2
+- Make it build on el8
+
+* Mon Aug 15 2022 Siteshwar Vashisht <svashisht@redhat.com> 3.5.1-1
+- Update to 3.5.1
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> 3.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jun 17 2022 Siteshwar Vashisht <svashisht@redhat.com> 3.5.0-1
+- Update to 3.5.0
+
+* Sun Apr 03 2022 Igor Raits <igor.raits@gmail.com> 3.4.1^120g1a0b1ae238e-1
+- Update to 3.4.1-120-g1a0b1ae23
+
+* Sun Apr 03 2022 Igor Raits <igor.raits@gmail.com> 3.4.1-1
+- Update to 3.4.1
+
+* Sun Mar 13 2022 Igor Raits <igor.raits@gmail.com> 3.4.0-1
+- Update to 3.4.0
+
+* Mon Feb 21 2022 Igor Raits <igor.raits@gmail.com> 3.3.1^1075ge0bc944d5c5-1
+- Update to 3.3.1-1075-ge0bc944d5
+
+* Sun Feb 06 2022 Igor Raits <igor.raits@gmail.com> 3.3.1^1034g964b7a729a7-1
+- Update to 3.3.1-1034-g964b7a729
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> 3.3.1^803g76a336d647e-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Dec 29 2021 Igor Raits <igor.raits@gmail.com> 3.3.1^803g76a336d647e-2
+- Add missing BuildRequires for tests
+
+* Wed Dec 29 2021 Igor Raits <igor.raits@gmail.com> 3.3.1^803g76a336d647e-1
+- Update to 3.3.1-803-g76a336d64
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jul 07 2021 Siteshwar Vashisht <svashisht@redhat.com> - 3.3.1-1
+- Update to 3.3.1
+  Resolves: #1979734
+
+* Thu Jul 01 2021 Siteshwar Vashisht <svashisht@redhat.com> - 3.3.0-1
+- Update to 3.3.0
+  Resolves: #1947062
+
+* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 3.2.1-2
+- Rebuilt for removed libstdc++ symbol (#1937698)
+
+* Thu Mar 18 2021 Siteshwar Vashisht <svashisht@redhat.com> - 3.2.1-1
+- Update to 3.2.1
+  Resolves: #1940398
+
+* Sat Mar 13 2021 Siteshwar Vashisht <svashisht@redhat.com> - 3.2.0-1
+- Update to 3.2.0
+  Resolves: #1933886
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Aug 25 2020 Oliver Falk <oliver@linux-kernel.at> - 3.1.2-5
+- Correct pkgconfig references to /usr/local (RHBZ#1869376)
+
+* Mon Aug 17 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 3.1.2-4
+- Remove automagic Python bytecompilation | Fix FTBFS f33 | RH#1863559
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed May 06 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 3.1.2-1
+- Update to 3.1.2
+
+* Sat Feb 15 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 3.1.0-1
+- Update to 3.1.0
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 24 2019 luto@kernel.org - 3.0.2-1
+- Update to 3.0.2
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jan 05 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.0.0-4
+- Fix crash in 'string match' subcommand
+
+* Sun Dec 30 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.0.0-3
+- Switch to CMake/Ninja
+
+* Sat Dec 29 2018 David Adam <zanchey@ucc.gu.uwa.edu.au> - 3.0.0-2
+- Move to CMake builds
+- Drop unneeded dependencies
+
+* Fri Dec 28 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.0.0-1
+- Update to 3.0.0
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2.7.1-3
+- Rebuilt for Python 3.7
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sun Jan 14 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.7.1-1
+- Update to 2.7.1
+
+* Wed Oct 04 2017 Andy Lutomirski <luto@kernel.org> - 2.6.0-1
+- Update to 2.6.0
+- Stop using bundled pcre2
+- Add some missing dependencies (rhbz #1478779)
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sun Mar 12 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2.3.1-4
+- Drop ExcludeArch as ppc64le's tests now pass
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-2
+- Rebuild for Python 3.6
+
+* Thu Jul 07 2016 Oliver Haessler <oliver@redhat.com> - 2.3.1-1
+- Bump to 2.3.1
+
+* Sun Jun 26 2016 luto@kernel.org - 2.3.0-2
+- Require bc (rhbz 1349714)
+- Improve Fedora vs EPEL compatibility in the specfile
+
+* Sun May 22 2016 luto@kernel.org - 2.3.0-1
+- Bump to 2.3.0
+- Drop most Fedora patches
+
+* Fri Feb 26 2016 luto@kernel.org - 2.2.0-11
+- Add function/snippet hierarchy (backported from upstream)
+
+* Thu Feb 04 2016 luto@kernel.org - 2.2.0-10
+- Fix build on GCC 6
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Mon Jan 04 2016 Andy Lutomirski <luto@mit.edu> - 2.2.0-8
+- Tidy up EL compat
+
+* Sat Jan 02 2016 Oliver Haessler <oliver@redhat.com> - 2.2.0-7
+- included patch directly into the spec file
+- added new patch for using python3.4 on EPEL 7
+- excluded ppc64le as the fish_tests fail for this arch
+
+* Mon Dec 21 2015 Oliver Haessler <oliver@redhat.com> - 2.2.0-6
+- added new patch for EL7 build
+
+* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
+
+* Thu Sep 24 2015 Andy Lutomirski <luto@mit.edu> - 2.2.0-4
+- Hopefully fix rhbz #1263052 / upstream #2393
+
+* Thu Aug 20 2015 Andy Lutomirski <luto@mit.edu> - 2.2.0-3
+- Re-enable tests
+
+* Wed Aug 19 2015 Andy Lutomirski <luto@mit.edu> - 2.2.0-2
+- Fix docs on newer RPM
+
+* Wed Aug 19 2015 Andy Lutomirski <luto@mit.edu> - 2.0.0-1
+- Bump to 2.2.0
+- Drop most Fedora patches
+- Disable tests (broken upstream)
+- Adapt to new tarball contents
+- Drop Python 2 support (we will only target F22 and newer)
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 2.1.1-4
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Wed Dec 17 2014 Andy Lutomirski <luto@mit.edu> - 2.1.1-3
+- For Fedora 22+, use Python 3
+
+* Sun Dec 14 2014 Andy Lutomirski <luto@mit.edu> - 2.1.1-2
+- Backport grep.fish fixes (rhbz #1173924)
+
+* Mon Sep 29 2014 Andy Lutomirski <luto@mit.edu> - 2.1.1-1
+- Update to 2.1.1
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Tue Aug 12 2014 Andy Lutomirski <luto@mit.edu> - 2.1.0-11
+- Improve fixes for CVE-2014-2905 and CVE-2014-2914
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Mon Apr 28 2014 Andy Lutomirski <luto@mit.edu> - 2.1.0-9
+- Fix CVE-2014-2914
+
+* Mon Apr 28 2014 Andy Lutomirski <luto@mit.edu> - 2.1.0-8
+- Fix build failure
+
+* Mon Apr 28 2014 Andy Lutomirski <luto@mit.edu> - 2.1.0-7
+- Fix CVE-2014-2905
+- Fix CVE-2014-2906
+
+* Fri Dec 20 2013 Andy Lutomirski <luto@mit.edu> - 2.1.0-6
+- Switch back to Python 2
+
+* Fri Dec 20 2013 Andy Lutomirski <luto@mit.edu> - 2.1.0-5
+- Add BR: python3 (for __pycache__)
+- Remove --without-xsel: fish dropped it in favor of a runtime check
+
+* Fri Dec 13 2013 Andy Lutomirski <luto@mit.edu> - 2.1.0-4
+- Stop looking in /usr/local (#1185 upstream)
+- Link with CXXFLAGS (#1062 upstream)
+- Use /usr/bin/python3 in scripts intead of /usr/bin/env
+- Add fish_tests to the build process
+- Split up the %%doc lines
+
+* Wed Dec 11 2013 Andy Lutomirski <luto@mit.edu> - 2.1.0-3
+- Use %%make_install instead of make install DESTDIR=...
+- Removed rm -rf %%{buildroot}
+- Added Requires: python
+
+* Tue Dec 10 2013 Andy Lutomirski <luto@mit.edu> - 2.1.0-2
+- Drop 'help' patch
+- Misc cleanups
+
+* Mon Dec 9 2013 Andy Lutomirski <luto@mit.edu> - 2.1.0-1
+- Update to 2.1.0 and update a lot of the specfile
+- Fix bogus changelog dates
+- Add a patch to make 'help' work on F19 (upstream #1065)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 03 2009 Lorenzo Villani <lvillani@binaryhelix.net> - 1.23.1-3
+- Pass --without-xsel to configure, if you want xsel install its package instead
+- Fix file list
+- Drop unneeded BuildRequires
+
+* Fri Jul 03 2009 Lorenzo Villani <lvillani@binaryhelix.net> - 1.23.1-2
+- rebuilt
+
+* Fri Jul 03 2009 Lorenzo Villani <lvillani@binaryhelix.net> - 1.23.1-1
+- 1.23.1
+- Fix bz #472613
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Sep 15 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.23.0-6
+- cleanups
+- define ARG_MAX properly so it compiles
+
+* Mon Jul 07 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.23.0-5
+- fix conditional comparison
+
+* Sun Jul 06 2008 Oliver Falk <oliver@linux-kernel.at> - 1.23.0-4
+- Rebuild
+
+* Wed May 21 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.23.0-3
+- fix license tag
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.23.0-2
+- Autorebuild for GCC 4.3
+
+* Mon Jan 14 2008 Oliver Falk <oliver@linux-kernel.at> - 1.23.0-1
+- Update to fix #208780
+- Remove openfix patch, included upstream now
+
+* Wed Oct 31 2007 Oliver Falk <oliver@linux-kernel.at> - 1.22.3-5
+- Fix glibc's open check, by providing mode, instead of working
+  around...
+
+* Wed Oct 31 2007 Oliver Falk <oliver@linux-kernel.at> - 1.22.3-4
+- Update URL; Fixes bz#359451
+
+* Thu Aug 16 2007 Oliver Falk <oliver@linux-kernel.at> - 1.22.3-3
+- Workaround glibc's open check
+- Problem reported upstream; Should be fixed there
+
+* Tue Aug 07 2007 Oliver Falk <oliver@linux-kernel.at> - 1.22.3-2
+- Fix BR autoconf
+
+* Tue Aug 07 2007 Oliver Falk <oliver@linux-kernel.at> - 1.22.3-1
+- Update; Bug #236868
+- Add missing doxygen BR
+
+* Fri Aug 4 2006 Axel Liljencrantz<axel@liljencrantz.se> 1.21.10-4
+- Add better translation finding code from fedora spec to main spec. Thank you to Michael Schwendt.
+- Add missing dependency libXext-devel.
+- Remove one nesting level from dependency checking code.
+
+* Tue Aug 1 2006 Axel Liljencrantz<axel@liljencrantz.se> 1.21.10-1
+- Improved the dependency check for X headers. Thank you to Michael Schwendt for pointers on how to do this
+
+* Mon Jul 31 2006 Axel Liljencrantz<axel@liljencrantz.se> 1.21.10-1
+- Fixed spelling and punctuation as a per patch from Paul Howarth
+- Fixed dependencies as per patch from Paul Howarth
+
+* Tue Nov 29 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.17.0-0
+- 1.17.0
+
+* Sat Sep 24 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.14.0-0
+- 1.14.0
+
+* Mon Sep 12 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.4-0
+- 1.13.4
+
+* Wed Sep 07 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.3-0
+- 1.13.3
+
+* Tue Sep 06 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.2-0
+- 1.13.2
+
+* Tue Aug 30 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.1-0
+- 1.13.1
+
+* Sun Aug 28 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.0-0
+- 1.13.0
+
+* Sat Aug 13 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.0-0
+- Add completions subdirectory
+
+* Thu Jul 28 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.12.1-0
+- 1.12.1
+
+* Fri Jul 15 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.12.0-1
+- 1.12.0
+
+* Thu Jun 30 2005 Michael Schwendt <mschwendt@users.sf.net> 1.11.1-9
+- Set CFLAGS the proper way
+
+* Thu Jun 30 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.11.1-8
+- Fix revision number in changelog
+
+* Wed Jun 29 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.11.1-7
+- Send post-script output to /dev/null
+
+* Wed Jun 29 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.11.1-6
+- Add changelog section to spec file
+- Add macros to source tags
+- Add smp_mflags to 'make all'
+- Fix typo in post install scriptlet test
+- Set CFLAGS from spec file
diff --git a/fish.spec b/fish.spec
index 6e6af23..c716aad 100644
--- a/fish.spec
+++ b/fish.spec
@@ -5,7 +5,7 @@
 
 Name:           fish
 Version:        %{version_base}%{?gitnum:^%{gitnum}g%{githashshort}}
-Release:        3%{?dist}
+Release:        %autorelease
 Summary:        Friendly interactive shell
 # GPLv2
 #   - src/fish.cpp
@@ -146,374 +146,4 @@ 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
-
-* Tue Sep 06 2022 Davide Cavalca <dcavalca@centosproject.org> 3.5.1-2
-- Add Facebook internal patch to log history to syslog
-
-* Tue Sep 06 2022 Davide Cavalca <dcavalca@centosproject.org> 3.5.1-2
-- Make it build on el8
-
-* Mon Aug 15 2022 Siteshwar Vashisht <svashisht@redhat.com> 3.5.1-1
-- Update to 3.5.1
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> 3.5.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jun 17 2022 Siteshwar Vashisht <svashisht@redhat.com> 3.5.0-1
-- Update to 3.5.0
-
-* Sun Apr 03 2022 Igor Raits <igor.raits@gmail.com> 3.4.1^120g1a0b1ae238e-1
-- Update to 3.4.1-120-g1a0b1ae23
-
-* Sun Apr 03 2022 Igor Raits <igor.raits@gmail.com> 3.4.1-1
-- Update to 3.4.1
-
-* Sun Mar 13 2022 Igor Raits <igor.raits@gmail.com> 3.4.0-1
-- Update to 3.4.0
-
-* Mon Feb 21 2022 Igor Raits <igor.raits@gmail.com> 3.3.1^1075ge0bc944d5c5-1
-- Update to 3.3.1-1075-ge0bc944d5
-
-* Sun Feb 06 2022 Igor Raits <igor.raits@gmail.com> 3.3.1^1034g964b7a729a7-1
-- Update to 3.3.1-1034-g964b7a729
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> 3.3.1^803g76a336d647e-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Dec 29 2021 Igor Raits <igor.raits@gmail.com> 3.3.1^803g76a336d647e-2
-- Add missing BuildRequires for tests
-
-* Wed Dec 29 2021 Igor Raits <igor.raits@gmail.com> 3.3.1^803g76a336d647e-1
-- Update to 3.3.1-803-g76a336d64
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jul 07 2021 Siteshwar Vashisht <svashisht@redhat.com> - 3.3.1-1
-- Update to 3.3.1
-  Resolves: #1979734
-
-* Thu Jul 01 2021 Siteshwar Vashisht <svashisht@redhat.com> - 3.3.0-1
-- Update to 3.3.0
-  Resolves: #1947062
-
-* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 3.2.1-2
-- Rebuilt for removed libstdc++ symbol (#1937698)
-
-* Thu Mar 18 2021 Siteshwar Vashisht <svashisht@redhat.com> - 3.2.1-1
-- Update to 3.2.1
-  Resolves: #1940398
-
-* Sat Mar 13 2021 Siteshwar Vashisht <svashisht@redhat.com> - 3.2.0-1
-- Update to 3.2.0
-  Resolves: #1933886
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Aug 25 2020 Oliver Falk <oliver@linux-kernel.at> - 3.1.2-5
-- Correct pkgconfig references to /usr/local (RHBZ#1869376)
-
-* Mon Aug 17 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 3.1.2-4
-- Remove automagic Python bytecompilation | Fix FTBFS f33 | RH#1863559
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-3
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed May 06 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 3.1.2-1
-- Update to 3.1.2
-
-* Sat Feb 15 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 3.1.0-1
-- Update to 3.1.0
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 24 2019 luto@kernel.org - 3.0.2-1
-- Update to 3.0.2
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jan 05 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.0.0-4
-- Fix crash in 'string match' subcommand
-
-* Sun Dec 30 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.0.0-3
-- Switch to CMake/Ninja
-
-* Sat Dec 29 2018 David Adam <zanchey@ucc.gu.uwa.edu.au> - 3.0.0-2
-- Move to CMake builds
-- Drop unneeded dependencies
-
-* Fri Dec 28 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.0.0-1
-- Update to 3.0.0
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2.7.1-3
-- Rebuilt for Python 3.7
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sun Jan 14 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.7.1-1
-- Update to 2.7.1
-
-* Wed Oct 04 2017 Andy Lutomirski <luto@kernel.org> - 2.6.0-1
-- Update to 2.6.0
-- Stop using bundled pcre2
-- Add some missing dependencies (rhbz #1478779)
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sun Mar 12 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2.3.1-4
-- Drop ExcludeArch as ppc64le's tests now pass
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-2
-- Rebuild for Python 3.6
-
-* Thu Jul 07 2016 Oliver Haessler <oliver@redhat.com> - 2.3.1-1
-- Bump to 2.3.1
-
-* Sun Jun 26 2016 luto@kernel.org - 2.3.0-2
-- Require bc (rhbz 1349714)
-- Improve Fedora vs EPEL compatibility in the specfile
-
-* Sun May 22 2016 luto@kernel.org - 2.3.0-1
-- Bump to 2.3.0
-- Drop most Fedora patches
-
-* Fri Feb 26 2016 luto@kernel.org - 2.2.0-11
-- Add function/snippet hierarchy (backported from upstream)
-
-* Thu Feb 04 2016 luto@kernel.org - 2.2.0-10
-- Fix build on GCC 6
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Jan 04 2016 Andy Lutomirski <luto@mit.edu> - 2.2.0-8
-- Tidy up EL compat
-
-* Sat Jan 02 2016 Oliver Haessler <oliver@redhat.com> - 2.2.0-7
-- included patch directly into the spec file
-- added new patch for using python3.4 on EPEL 7
-- excluded ppc64le as the fish_tests fail for this arch
-
-* Mon Dec 21 2015 Oliver Haessler <oliver@redhat.com> - 2.2.0-6
-- added new patch for EL7 build
-
-* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
-
-* Thu Sep 24 2015 Andy Lutomirski <luto@mit.edu> - 2.2.0-4
-- Hopefully fix rhbz #1263052 / upstream #2393
-
-* Thu Aug 20 2015 Andy Lutomirski <luto@mit.edu> - 2.2.0-3
-- Re-enable tests
-
-* Wed Aug 19 2015 Andy Lutomirski <luto@mit.edu> - 2.2.0-2
-- Fix docs on newer RPM
-
-* Wed Aug 19 2015 Andy Lutomirski <luto@mit.edu> - 2.0.0-1
-- Bump to 2.2.0
-- Drop most Fedora patches
-- Disable tests (broken upstream)
-- Adapt to new tarball contents
-- Drop Python 2 support (we will only target F22 and newer)
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 2.1.1-4
-- Rebuilt for GCC 5 C++11 ABI change
-
-* Wed Dec 17 2014 Andy Lutomirski <luto@mit.edu> - 2.1.1-3
-- For Fedora 22+, use Python 3
-
-* Sun Dec 14 2014 Andy Lutomirski <luto@mit.edu> - 2.1.1-2
-- Backport grep.fish fixes (rhbz #1173924)
-
-* Mon Sep 29 2014 Andy Lutomirski <luto@mit.edu> - 2.1.1-1
-- Update to 2.1.1
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Tue Aug 12 2014 Andy Lutomirski <luto@mit.edu> - 2.1.0-11
-- Improve fixes for CVE-2014-2905 and CVE-2014-2914
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Mon Apr 28 2014 Andy Lutomirski <luto@mit.edu> - 2.1.0-9
-- Fix CVE-2014-2914
-
-* Mon Apr 28 2014 Andy Lutomirski <luto@mit.edu> - 2.1.0-8
-- Fix build failure
-
-* Mon Apr 28 2014 Andy Lutomirski <luto@mit.edu> - 2.1.0-7
-- Fix CVE-2014-2905
-- Fix CVE-2014-2906
-
-* Fri Dec 20 2013 Andy Lutomirski <luto@mit.edu> - 2.1.0-6
-- Switch back to Python 2
-
-* Fri Dec 20 2013 Andy Lutomirski <luto@mit.edu> - 2.1.0-5
-- Add BR: python3 (for __pycache__)
-- Remove --without-xsel: fish dropped it in favor of a runtime check
-
-* Fri Dec 13 2013 Andy Lutomirski <luto@mit.edu> - 2.1.0-4
-- Stop looking in /usr/local (#1185 upstream)
-- Link with CXXFLAGS (#1062 upstream)
-- Use /usr/bin/python3 in scripts intead of /usr/bin/env
-- Add fish_tests to the build process
-- Split up the %%doc lines
-
-* Wed Dec 11 2013 Andy Lutomirski <luto@mit.edu> - 2.1.0-3
-- Use %%make_install instead of make install DESTDIR=...
-- Removed rm -rf %%{buildroot}
-- Added Requires: python
-
-* Tue Dec 10 2013 Andy Lutomirski <luto@mit.edu> - 2.1.0-2
-- Drop 'help' patch
-- Misc cleanups
-
-* Mon Dec 9 2013 Andy Lutomirski <luto@mit.edu> - 2.1.0-1
-- Update to 2.1.0 and update a lot of the specfile
-- Fix bogus changelog dates
-- Add a patch to make 'help' work on F19 (upstream #1065)
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Fri Jul 03 2009 Lorenzo Villani <lvillani@binaryhelix.net> - 1.23.1-3
-- Pass --without-xsel to configure, if you want xsel install its package instead
-- Fix file list
-- Drop unneeded BuildRequires
-
-* Fri Jul 03 2009 Lorenzo Villani <lvillani@binaryhelix.net> - 1.23.1-2
-- rebuilt
-
-* Fri Jul 03 2009 Lorenzo Villani <lvillani@binaryhelix.net> - 1.23.1-1
-- 1.23.1
-- Fix bz #472613
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Mon Sep 15 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.23.0-6
-- cleanups
-- define ARG_MAX properly so it compiles
-
-* Mon Jul 07 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.23.0-5
-- fix conditional comparison
-
-* Sun Jul 06 2008 Oliver Falk <oliver@linux-kernel.at> - 1.23.0-4
-- Rebuild
-
-* Wed May 21 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.23.0-3
-- fix license tag
-
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.23.0-2
-- Autorebuild for GCC 4.3
-
-* Mon Jan 14 2008 Oliver Falk <oliver@linux-kernel.at> - 1.23.0-1
-- Update to fix #208780
-- Remove openfix patch, included upstream now
-
-* Wed Oct 31 2007 Oliver Falk <oliver@linux-kernel.at> - 1.22.3-5
-- Fix glibc's open check, by providing mode, instead of working
-  around...
-
-* Wed Oct 31 2007 Oliver Falk <oliver@linux-kernel.at> - 1.22.3-4
-- Update URL; Fixes bz#359451
-
-* Thu Aug 16 2007 Oliver Falk <oliver@linux-kernel.at> - 1.22.3-3
-- Workaround glibc's open check
-- Problem reported upstream; Should be fixed there
-
-* Tue Aug 07 2007 Oliver Falk <oliver@linux-kernel.at> - 1.22.3-2
-- Fix BR autoconf
-
-* Tue Aug 07 2007 Oliver Falk <oliver@linux-kernel.at> - 1.22.3-1
-- Update; Bug #236868
-- Add missing doxygen BR
-
-* Fri Aug 4 2006 Axel Liljencrantz<axel@liljencrantz.se> 1.21.10-4
-- Add better translation finding code from fedora spec to main spec. Thank you to Michael Schwendt.
-- Add missing dependency libXext-devel.
-- Remove one nesting level from dependency checking code.
-
-* Tue Aug 1 2006 Axel Liljencrantz<axel@liljencrantz.se> 1.21.10-1
-- Improved the dependency check for X headers. Thank you to Michael Schwendt for pointers on how to do this
-
-* Mon Jul 31 2006 Axel Liljencrantz<axel@liljencrantz.se> 1.21.10-1
-- Fixed spelling and punctuation as a per patch from Paul Howarth
-- Fixed dependencies as per patch from Paul Howarth
-
-* Tue Nov 29 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.17.0-0
-- 1.17.0
-
-* Sat Sep 24 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.14.0-0
-- 1.14.0
-
-* Mon Sep 12 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.4-0
-- 1.13.4
-
-* Wed Sep 07 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.3-0
-- 1.13.3
-
-* Tue Sep 06 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.2-0
-- 1.13.2
-
-* Tue Aug 30 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.1-0
-- 1.13.1
-
-* Sun Aug 28 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.0-0
-- 1.13.0
-
-* Sat Aug 13 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.0-0
-- Add completions subdirectory
-
-* Thu Jul 28 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.12.1-0
-- 1.12.1
-
-* Fri Jul 15 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.12.0-1
-- 1.12.0
-
-* Thu Jun 30 2005 Michael Schwendt <mschwendt@users.sf.net> 1.11.1-9
-- Set CFLAGS the proper way
-
-* Thu Jun 30 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.11.1-8
-- Fix revision number in changelog
-
-* Wed Jun 29 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.11.1-7
-- Send post-script output to /dev/null
-
-* Wed Jun 29 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.11.1-6
-- Add changelog section to spec file
-- Add macros to source tags
-- Add smp_mflags to 'make all'
-- Fix typo in post install scriptlet test
-- Set CFLAGS from spec file
+%autochangelog

From ef745b09c5844920e6d75f3db86297142362084c Mon Sep 17 00:00:00 2001
From: Michel Lind <salimma@centosproject.org>
Date: Feb 28 2025 18:33:35 +0000
Subject: [PATCH 17/17] Merge remote-tracking branch 'fedora/epel10' into c9s-sig-hyperscale


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

---

diff --git a/changelog b/changelog
index 38357cd..c771788 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+* Fri Feb 28 2025 Michel Lind <salimma@centosproject.org> 3.7.1-2
+- [Facebook] Refresh syslog patch
+- Always include all patches in src.rpm
+
+* Fri Feb 28 2025 Michel Lind <salimma@centosproject.org> 3.7.1-1
+- Rebase to 3.7.1-1 from EPEL 10
+
 * Fri Feb 28 2025 Michel Lind <salimma@centosproject.org> 3.5.1-3
 - Revert EL8 workaround, no longer needed
 
diff --git a/fish.spec b/fish.spec
index c716aad..974fbc9 100644
--- a/fish.spec
+++ b/fish.spec
@@ -1,17 +1,18 @@
-%global version_base 3.5.1
-#global gitnum 120
-#global githash 1a0b1ae238e1deb132a0ae4a8d0c589d583cc5b0
-#global githashshort #{lua:print(string.sub(rpm.expand('#{githash}'), 1, 11))}
+%global version_base 3.7.1
+%dnl %global gitnum 120
+%dnl %global githash 1a0b1ae238e1deb132a0ae4a8d0c589d583cc5b0
+%dnl %global githashshort %{lua:print(string.sub(rpm.expand('%{githash}'), 1, 11))}
 
 Name:           fish
 Version:        %{version_base}%{?gitnum:^%{gitnum}g%{githashshort}}
 Release:        %autorelease
 Summary:        Friendly interactive shell
+# see also doc_src/license.rst
 # GPLv2
 #   - src/fish.cpp
 #   and rest…
 # GPLv2+
-#   - src/builtin_printf.cpp
+#   - src/builtins/printf.cpp
 # BSD
 #   - src/fallback.cpp
 #   - share/tools/create_manpage_completions.py
@@ -27,7 +28,9 @@ Summary:        Friendly interactive shell
 #   - share/tools/web_config/js/angular-route.js
 #   - share/tools/web_config/js/angular-sanitize.js
 #   - share/tools/web_config/js/angular.js
-License:        GPLv2 and BSD and ISC and LGPLv2+ and MIT
+# PSF-2.0
+#   - doc_src/python_docs_theme/,
+License:        GPL-2.0-only AND BSD-3-Clause AND ISC AND LGPL-2.0-or-later AND MIT AND PSF-2.0
 URL:            https://fishshell.com
 %if %{undefined gitnum}
 Source0:        https://github.com/fish-shell/fish-shell/releases/download/%{version}/%{name}-%{version}.tar.xz
@@ -36,10 +39,8 @@ Source2:        gpgkey-003837986104878835FA516D7A67D962D88A709A.gpg
 %else
 Source0:        https://github.com/fish-shell/fish-shell/archive/%{githash}/%{name}-%{githash}.tar.gz
 %endif
-%if 0%{?facebook}
 # Log history to syslog
-Patch:          log-history-to-syslog.patch
-%endif
+Patch101:          log-history-to-syslog.patch
 
 BuildRequires:  cmake >= 3.5
 BuildRequires:  ninja-build
@@ -74,11 +75,14 @@ nothing to learn or configure.
 %if %{undefined gitnum}
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %endif
-%autosetup -p1 %{?gitnum:-n fish-shell-%{githash}}
+%autosetup -N %{?gitnum:-n fish-shell-%{githash}}
+%autopatch -p1 -M 100
+%if 0%{?facebook}
+%autopatch -p1 -m 101
+%endif
 %if %{defined gitnum}
 echo "%{version_base}-%{gitnum}g%{githashshort}" > version
 %endif
-rm -vr pcre2*
 
 # Change the bundled scripts to invoke the python binary directly.
 for f in $(find share/tools -type f -name '*.py'); do
diff --git a/log-history-to-syslog.patch b/log-history-to-syslog.patch
index ff9fd65..6cbc924 100644
--- a/log-history-to-syslog.patch
+++ b/log-history-to-syslog.patch
@@ -1,8 +1,6 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2e90030..4394696 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -115,6 +115,7 @@ set(FISH_SRCS
+@@ -121,6 +121,7 @@ set(FISH_SRCS
      src/tokenizer.cpp src/topic_monitor.cpp src/trace.cpp src/utf8.cpp src/util.cpp
      src/wait_handle.cpp src/wcstringutil.cpp src/wgetopt.cpp src/wildcard.cpp 
      src/wutil.cpp src/fds.cpp
@@ -10,30 +8,24 @@ index 2e90030..4394696 100644
  )
  
  # Header files are just globbed.
-diff --git a/src/reader.cpp b/src/reader.cpp
-index 785f680..16f55e2 100644
 --- a/src/reader.cpp
 +++ b/src/reader.cpp
-@@ -74,6 +74,7 @@
+@@ -76,6 +76,7 @@
  #include "reader.h"
  #include "screen.h"
  #include "signal.h"
 +#include "syslog.h"
  #include "termsize.h"
  #include "tokenizer.h"
- #include "wildcard.h"
-@@ -3479,6 +3480,8 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
-                     break;
-                 }
- 
-+                fish_syslog_history(text);
-+
-                 // Historical behavior is to trim trailing spaces.
-                 // However, escaped spaces ('\ ') should not be trimmed (#7661)
-                 // This can be done by counting pre-trailing '\'
-diff --git a/src/syslog.cpp b/src/syslog.cpp
-new file mode 100644
-index 0000000..c22c47b
+ #include "wcstringutil.h"
+@@ -4355,6 +4356,7 @@ void reader_data_t::add_to_history() con
+         } else {
+             mode = history_persistence_mode_t::disk;
+         }
++        fish_syslog_history(text);
+         history_t::add_pending_with_file_detection(history, text, this->vars().snapshot(), mode);
+     }
+ }
 --- /dev/null
 +++ b/src/syslog.cpp
 @@ -0,0 +1,24 @@
@@ -61,9 +53,6 @@ index 0000000..c22c47b
 +        syslog(SYSLOG_FACILITY|SYSLOG_LEVEL, "HISTORY (TRUNCATED): PID=%d UID=%d %s", getpid(), getuid(), cmd);
 +    }
 +}
-diff --git a/src/syslog.h b/src/syslog.h
-new file mode 100644
-index 0000000..ce0ce25
 --- /dev/null
 +++ b/src/syslog.h
 @@ -0,0 +1,17 @@
diff --git a/series b/series
new file mode 100644
index 0000000..d2b8243
--- /dev/null
+++ b/series
@@ -0,0 +1 @@
+log-history-to-syslog.patch
diff --git a/sources b/sources
index e6e05bb..48d8062 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (fish-3.5.1.tar.xz) = 328e3d972f9e7cffe161515540f00a97c5cbe11b43ec293090bedb96a6a8e689e07ceafecb3efcd0e378edea59811adb0acc011d5885ac28d98838387c678235
-SHA512 (fish-3.5.1.tar.xz.asc) = 8d1768fa46b37d4664a4007a8e81b197d2039463b9a8a163a486bb433017b65d4b9c7e9eebb7038f4258046b2ba59208d9253cd7dd050104670e169c4da1a877
+SHA512 (fish-3.7.1.tar.xz) = f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe
+SHA512 (fish-3.7.1.tar.xz.asc) = 924c51ead82ded38c6d2a91dae4ff568759cde30e023c2520d329d49ef163bc97e30274872b9325a9fdd591964106dd1e524fa429156d500338fe1d84d0739a6