From 0409a04c53dea406bde9b8fc0eae977ff4d5e41f5933b44370027882e538fdd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Mon, 23 May 2016 19:26:11 +0000
Subject: [PATCH] Accepting request 397351 from home:simotek:branches:shells
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Update to v2.3.0
- Significant Changes
   * A new string builtin to handle… strings!
   * After seeing an escape character wait up to 300ms for an a
     dditional character.
   * Add new directories for vendor functions and configuration
     snippets (#2498)
   * A new fish_realpath builtin and associated function to allow
     the use of realpath even on those platforms that don't ship
     an appropriate command. (#2932)
   * Alt-# toggles the current command line between commented and
     uncommented states, making it easy to save a command in
     history without executing it.
   * The fish_vi_mode function is now deprecated in favour of
     fish_vi_key_bindings
- Backward-incompatible changes
   * Unmatched globs will now cause an error, except when used
     with for, set or count (#2719, #2394) and and or will now bind
     to the closest if or while, allowing compound conditions without
     begin and end (#1428)
   * set -ql now searches up to function scope for variables (#2502)
   * status -f will now behave the same when run as the main script
     or using source (#2643)
   * source no longer puts the file name in $argv if no arguments
     are given (#139)
- Full release notes at
  https://github.com/fish-shell/fish-shell/releases/tag/2.3.0

OBS-URL: https://build.opensuse.org/request/show/397351
OBS-URL: https://build.opensuse.org/package/show/shells/fish?expand=0&rev=17
---
 fish-2.2.0.tar.gz                   |  3 ---
 fish-2.3.0.tar.gz                   |  3 +++
 fish.changes                        | 30 +++++++++++++++++++++++++++++
 fish.spec                           |  4 ++--
 no-return-in-nonvoid-function.patch |  6 +++---
 5 files changed, 38 insertions(+), 8 deletions(-)
 delete mode 100644 fish-2.2.0.tar.gz
 create mode 100644 fish-2.3.0.tar.gz

diff --git a/fish-2.2.0.tar.gz b/fish-2.2.0.tar.gz
deleted file mode 100644
index 4b1d635..0000000
--- a/fish-2.2.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a76339fd14ce2ec229283c53e805faac48c3e99d9e3ede9d82c0554acfc7b77a
-size 2213037
diff --git a/fish-2.3.0.tar.gz b/fish-2.3.0.tar.gz
new file mode 100644
index 0000000..f39af81
--- /dev/null
+++ b/fish-2.3.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:912bac47552b1aa0d483a39ade330356632586a8f726c0e805b46d45cfad54e5
+size 4537458
diff --git a/fish.changes b/fish.changes
index c820798..46497d0 100644
--- a/fish.changes
+++ b/fish.changes
@@ -1,4 +1,34 @@
 -------------------------------------------------------------------
+Mon May 23 01:05:17 UTC 2016 - sflees@suse.de
+
+- Update to v2.3.0
+- Significant Changes
+   * A new string builtin to handle… strings! 
+   * After seeing an escape character wait up to 300ms for an a
+     dditional character.
+   * Add new directories for vendor functions and configuration 
+     snippets (#2498)
+   * A new fish_realpath builtin and associated function to allow 
+     the use of realpath even on those platforms that don't ship 
+     an appropriate command. (#2932)
+   * Alt-# toggles the current command line between commented and 
+     uncommented states, making it easy to save a command in 
+     history without executing it.
+   * The fish_vi_mode function is now deprecated in favour of 
+     fish_vi_key_bindings
+- Backward-incompatible changes
+   * Unmatched globs will now cause an error, except when used 
+     with for, set or count (#2719, #2394) and and or will now bind 
+     to the closest if or while, allowing compound conditions without 
+     begin and end (#1428)
+   * set -ql now searches up to function scope for variables (#2502)
+   * status -f will now behave the same when run as the main script 
+     or using source (#2643)
+   * source no longer puts the file name in $argv if no arguments 
+     are given (#139) 
+- Full release notes at
+  https://github.com/fish-shell/fish-shell/releases/tag/2.3.0
+-------------------------------------------------------------------
 Thu Nov 19 12:19:45 UTC 2015 - infroma@gmail.com
 
 - Recommends: terminfo (required for some terminals)
diff --git a/fish.spec b/fish.spec
index 1ac9fda..6accee5 100644
--- a/fish.spec
+++ b/fish.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package fish
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           fish
-Version:        2.2.0
+Version:        2.3.0
 Release:        0
 Summary:        A user friendly interactive shell
 License:        GPL-2.0
diff --git a/no-return-in-nonvoid-function.patch b/no-return-in-nonvoid-function.patch
index cb50fa3..9f562e9 100644
--- a/no-return-in-nonvoid-function.patch
+++ b/no-return-in-nonvoid-function.patch
@@ -1,7 +1,7 @@
-Index: fish-2.1.1/fallback.cpp
+Index: fish-2.1.1/src/fallback.cpp
 ===================================================================
---- fish-2.1.1.orig/fallback.cpp
-+++ fish-2.1.1/fallback.cpp
+--- fish-2.1.1.orig/src/fallback.cpp
++++ fish-2.1.1/src/fallback.cpp
 @@ -61,6 +61,7 @@ int tputs(const char *str, int affcnt, i
      {
          fish_putc(*str++);