From 03a9996e4cfcdb2c027d021a88c17b5657323227f4f315925887f68bb7f08c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 10 Sep 2016 14:17:55 +0000
Subject: [PATCH 1/2] Accepting request 426312 from
 home:pluskalm:branches:shells

- Use shared libpcre instead of bundled one
- Small packaging changes

OBS-URL: https://build.opensuse.org/request/show/426312
OBS-URL: https://build.opensuse.org/package/show/shells/fish?expand=0&rev=22
---
 fish.changes |  6 ++++++
 fish.spec    | 22 +++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/fish.changes b/fish.changes
index b5d0bc7..53df640 100644
--- a/fish.changes
+++ b/fish.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Sep 10 10:09:00 UTC 2016 - mpluskal@suse.com
+
+- Use shared libpcre instead of bundled one
+- Small packaging changes
+
 -------------------------------------------------------------------
 Tue Jul  5 01:10:11 UTC 2016 - sflees@suse.de
 
diff --git a/fish.spec b/fish.spec
index 5f6f214..f53f606 100644
--- a/fish.spec
+++ b/fish.spec
@@ -23,38 +23,42 @@ Summary:        A user friendly interactive shell
 License:        GPL-2.0
 Group:          System/Shells
 Url:            http://fishshell.com/
-Source:         https://github.com/fish-shell/fish-shell/releases/download/%{version}/fish-%{version}.tar.gz 
+Source:         https://github.com/fish-shell/fish-shell/releases/download/%{version}/fish-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM no-return-in-nonvoid-function.patch Fix no-return-in-nonvoid-function error
 Patch0:         no-return-in-nonvoid-function.patch
-BuildRequires:  autoconf
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
 BuildRequires:  groff
 BuildRequires:  ncurses-devel
+BuildRequires:  pcre2-devel
+BuildRequires:  pkgconfig
 BuildRequires:  python
+Requires:       bc
 Requires:       man
 Requires:       python-curses
 Recommends:     terminfo
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-fish is a user friendly command line shell for UNIX-like operating systems such as Linux.
+fish is a user friendly command line shell for UNIX-like operating systems
+such as Linux.
 
-It's geared towards interactive use and its features are focused on user friendlieness and
-discoverability. The language syntax is simple but incompatible with other shell languages.
+It's geared towards interactive use and its features are focused on user
+friendlieness and discoverability. The language syntax is simple but
+incompatible with other shell languages.
 
 %prep
 %setup -q
 %patch0 -p1
 
 %build
-autoconf
-%configure
+%configure \
+  --without-included-pcre2
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
 %find_lang %{name}
 
 %post
@@ -72,7 +76,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%dir /etc/fish
+%dir %{_sysconfdir}/fish
 %config(noreplace) %{_sysconfdir}/%{name}/*
 %{_bindir}/*
 %{_datadir}/doc/%{name}

From 56a9abbff820c9ea16de62703099551101ce7d3966010274368df427f0621594 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 10 Sep 2016 14:18:19 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/shells/fish?expand=0&rev=23

---
 fish.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fish.spec b/fish.spec
index f53f606..c9a05f2 100644
--- a/fish.spec
+++ b/fish.spec
@@ -31,7 +31,7 @@ BuildRequires:  gcc-c++
 BuildRequires:  gettext
 BuildRequires:  groff
 BuildRequires:  ncurses-devel
-BuildRequires:  pcre2-devel
+BuildRequires:  pcre2-devel >= 10.21
 BuildRequires:  pkgconfig
 BuildRequires:  python
 Requires:       bc