From b3d7f449222db99585392118f6b06478183970fa Mon Sep 17 00:00:00 2001
From: Andy Lutomirski <luto@kernel.org>
Date: Oct 04 2017 19:28:22 +0000
Subject: Update to 2.6.0 and add some dependencies


---

diff --git a/.gitignore b/.gitignore
index 9da9632..7e66448 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /fish-2.2.0.tar.gz
 /fish-2.3.0.tar.gz
 /fish-2.3.1.tar.gz
+/fish-2.6.0.tar.gz
diff --git a/fish.spec b/fish.spec
index 9853b67..aa147e9 100644
--- a/fish.spec
+++ b/fish.spec
@@ -1,6 +1,6 @@
 Name:                   fish
-Version:                2.3.1
-Release:                6%{?dist}
+Version:                2.6.0
+Release:                1%{?dist}
 Summary:                A friendly interactive shell
 
 Group:                  System Environment/Shells
@@ -14,7 +14,13 @@ BuildRequires:          python%{python3_pkgversion}-devel
 # fish's 'math' command requires bc
 Requires:		bc
 
-BuildRequires:          ncurses-devel gettext groff doxygen
+# tab completion wants man-db
+Requires:		man-db man-pages
+
+# Other misc requirements
+Requires:		hostname
+
+BuildRequires:          ncurses-devel gettext groff doxygen pcre2-devel
 
 %description
 fish is a fully-equipped command line shell (like bash or zsh) that is
@@ -36,7 +42,7 @@ for i in share/tools/*.py share/tools/*/*.py; do
 done
 
 %build
-%configure --docdir=%{_pkgdocdir}
+%configure --docdir=%{_pkgdocdir} --without-included-pcre2
 make %{?_smp_mflags} all fish_tests
 
 
@@ -95,6 +101,11 @@ fi
 %{_pkgdocdir}
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index 1e00a9b..04929b0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2d13852a5c8e9e5bca00502b93e046a4  fish-2.3.1.tar.gz
+SHA512 (fish-2.6.0.tar.gz) = d4ded5ce24600e85673a7bb016e9dc36bce999b27f40e6b1ce0b9ca49a421be2d444d9d2b6f178f6eee963e59daa4a65df4c3de2a8086a610486f758fcfb0ed1