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..c9a05f2 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 >= 10.21 +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}