Hello community, here is the log from the commit of package fish for openSUSE:Factory checked in at 2015-01-29 09:58:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fish (Old) and /work/SRC/openSUSE:Factory/.fish.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fish" Changes: -------- --- /work/SRC/openSUSE:Factory/fish/fish.changes 2014-12-03 22:51:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fish.new/fish.changes 2015-01-29 09:58:20.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Jan 28 17:26:37 UTC 2015 - [email protected] + +- Added check_for_command-not-found_command_on_suse.patch + (https://github.com/fish-shell/fish-shell/issues/1208) + +------------------------------------------------------------------- New: ---- check_for_command-not-found_command_on_suse.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fish.spec ++++++ --- /var/tmp/diff_new_pack.BHjYLy/_old 2015-01-29 09:58:21.000000000 +0100 +++ /var/tmp/diff_new_pack.BHjYLy/_new 2015-01-29 09:58:21.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package fish # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,8 @@ Group: System/Shells Url: http://fishshell.com/ Source: http://fishshell.com/files/%{version}/fish-%{version}.tar.gz +# PATCH-FIX-UPSTREAM check_for_command-not-found_command_on_suse.patch gh#fish-shell/fish-shell#1208 +Patch0: check_for_command-not-found_command_on_suse.patch BuildRequires: autoconf BuildRequires: doxygen BuildRequires: gcc-c++ @@ -41,6 +43,7 @@ %prep %setup -q +%patch0 -p1 %build autoconf ++++++ check_for_command-not-found_command_on_suse.patch ++++++ >From 27b6fe682db3018f3ccbaf6f6f25b4ef81869316 Mon Sep 17 00:00:00 2001 From: David Adam <[email protected]> Date: Sun, 2 Feb 2014 21:39:17 +0800 Subject: [PATCH] Squashed commit of the following: commit d81ae2665fb7ff5123d8472e1d40d7d57fb4b291 Author: Max Gonzih <[email protected]> Date: Sun Feb 2 16:22:18 2014 +0300 Check for command-not-found command on suse commit 004b794c82d79bc9463cdb52784b9b5ea49f1c76 Author: Max Gonzih <[email protected]> Date: Sun Feb 2 14:04:41 2014 +0300 Fix cnf handler for Suse and Fedora fixes #1208 --- share/functions/__fish_config_interactive.fish | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish index b9afedd..9ff7edc 100644 --- a/share/functions/__fish_config_interactive.fish +++ b/share/functions/__fish_config_interactive.fish @@ -237,8 +237,20 @@ function __fish_config_interactive -d "Initializations that should be performed # Remove fish_command_not_found_setup so we only execute this once functions --erase __fish_command_not_found_setup - # First check in /usr/lib, this is where modern Ubuntus place this command - if test -f /usr/lib/command-not-found + # First check if we are on OpenSUSE since SUSE's handler has no options + # and expects first argument to be a command and second database + # also check if there is command-not-found command. + if begin; test -f /etc/SuSE-release; and type -p command-not-found > /dev/null 2> /dev/null; end + function __fish_command_not_found_handler --on-event fish_command_not_found + /usr/bin/command-not-found $argv + end + # Check for Fedora's handler + else if test -f /usr/libexec/pk-command-not-found + function __fish_command_not_found_handler --on-event fish_command_not_found + /usr/libexec/pk-command-not-found -- $argv + end + # Check in /usr/lib, this is where modern Ubuntus place this command + else if test -f /usr/lib/command-not-found function __fish_command_not_found_handler --on-event fish_command_not_found /usr/lib/command-not-found -- $argv end -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
