Accepting request 319024 from home:develop7:branches:shells

update to v2.2.0

OBS-URL: https://build.opensuse.org/request/show/319024
OBS-URL: https://build.opensuse.org/package/show/shells/fish?expand=0&rev=13

check_for_command-not-found_command_on_suse.patch

@@ -1,49 +0,0 @@
-From 27b6fe682db3018f3ccbaf6f6f25b4ef81869316 Mon Sep 17 00:00:00 2001
-From: David Adam <zanchey@ucc.gu.uwa.edu.au>
-Date: Sun, 2 Feb 2014 21:39:17 +0800
-Subject: [PATCH] Squashed commit of the following:
-
-commit d81ae2665fb7ff5123d8472e1d40d7d57fb4b291
-Author: Max Gonzih <gonzih@gmail.com>
-Date:   Sun Feb 2 16:22:18 2014 +0300
-
-    Check for command-not-found command on suse
-
-commit 004b794c82d79bc9463cdb52784b9b5ea49f1c76
-Author: Max Gonzih <gonzih@gmail.com>
-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

fish-2.1.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b7e4d3c3d55fc3859edcb20462fcf0d14ab26e920eddcd503072e8105284d924
-size 1681744

fish-2.2.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a76339fd14ce2ec229283c53e805faac48c3e99d9e3ede9d82c0554acfc7b77a
+size 2213037

fish.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jul 27 06:53:55 UTC 2015 - develop7@develop7.info
+
+- update to v2.2.0
+  See full changelog on 
+  https://github.com/fish-shell/fish-shell/releases/tag/2.2.0
+- Drop check_for_command-not-found_command_on_suse.patch
+
 -------------------------------------------------------------------
 Sat Mar 21 02:41:33 UTC 2015 - simon@simotek.net
 

fish.spec

@@ -17,17 +17,15 @@
 
 
 Name:           fish
-Version:        2.1.1
+Version:        2.2.0
 Release:        0
 Summary:        A user friendly interactive shell
 License:        GPL-2.0
 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
 # PATCH-FIX-UPSTREAM no-return-in-nonvoid-function.patch Fix no-return-in-nonvoid-function error
-Patch1:         no-return-in-nonvoid-function.patch
+Patch0:         no-return-in-nonvoid-function.patch
 BuildRequires:  autoconf
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
@@ -47,7 +45,6 @@ discoverability. The language syntax is simple but incompatible with other shell
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 autoconf
@@ -78,8 +75,7 @@ fi
 %{_bindir}/*
 %{_datadir}/doc/%{name}
 %{_datadir}/%{name}
-%{_datadir}/%{name}/completions
-%{_datadir}/%{name}/tools
+%{_datadir}/pkgconfig/fish.pc
 %{_mandir}/man1/*
 
 %changelog