diff --git a/fish.spec b/fish.spec index 4fbae09..7c9ba28 100644 --- a/fish.spec +++ b/fish.spec @@ -4,7 +4,7 @@ Name: fish Version: 3.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Friendly interactive shell # GPLv2 @@ -30,6 +30,7 @@ Source0: https://github.com/fish-shell/fish-shell/releases/download/%{ver # https://github.com/fish-shell/fish-shell/commit/742fde0dd68858ad603b449501f0c42cd7864fab Patch0001: 0001-Don-t-use-less-in-highlighting-test.patch +BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gettext @@ -39,14 +40,10 @@ BuildRequires: pcre2-devel BuildRequires: python3-devel %global __python %{__python3} -# fish's 'math' command requires bc -Requires: bc # tab completion wants man-db Recommends: man-db Recommends: man-pages Recommends: groff-base -# Other misc requirements -Requires: hostname %description fish is a fully-equipped command line shell (like bash or zsh) that is @@ -64,7 +61,7 @@ for f in $(find share/tools -type f -name '*.py'); do done %build -%configure --docdir=%{_pkgdocdir} --without-included-pcre2 +%cmake -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} . %make_build all fish_tests %install @@ -111,6 +108,10 @@ fi %{_pkgdocdir} %changelog +* Sat Dec 29 2018 David Adam - 3.0.0-2 +- Move to CMake builds +- Drop unneeded dependencies + * Fri Dec 28 2018 Igor Gnatenko - 3.0.0-1 - Update to 3.0.0