Accepting request 967386 from shells

OBS-URL: https://build.opensuse.org/request/show/967386
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fish?expand=0&rev=34

8784-old-school-cmd-subst.patch

@@ -1,24 +0,0 @@
-From 0c5a13346cd2a09125b3c24e24855723bca8679d Mon Sep 17 00:00:00 2001
-From: Fabian Homborg <FHomborg@gmail.com>
-Date: Sun, 13 Mar 2022 20:00:02 +0100
-Subject: [PATCH] Use old-school "()" command substitution in fish_title
-
-Because we reload changed function files, a common issue on upgrading
-to 3.4.0 is that fish_title causes errors.
-
-So we simply use the oldschool syntax.
----
- share/functions/fish_title.fish |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/share/functions/fish_title.fish
-+++ b/share/functions/fish_title.fish
-@@ -4,7 +4,7 @@ function fish_title
-         # If we're connected via ssh, we print the hostname.
-         set -l ssh
-         set -q SSH_TTY
--        and set ssh "[$(prompt_hostname | string sub -l 10)]"
-+        and set ssh "["(prompt_hostname | string sub -l 10 | string collect)"]"
-         # An override for the current command is passed as the first parameter.
-         # This is used by `fg` to show the true process name, among others.
-         if set -q argv[1]

fish-3.4.0.tar.xz

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

fish-3.4.0.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEnh3gZzzMAykZ0YUmwLlpspdOiI4FAmIsspYACgkQwLlpspdO
-iI6Vxw//bUtxqlS5uRqQ4h7gwyy+Xqk5sdvzb08aQbo/MjLH8OLHpZ0aDxMBY2tV
-KvRKE+lvPStUK/ty+gi4ijNXXj1VCyGi4IqXZl+SBwlaY4RG0Hv11q2Qfo4Ad+Hm
-tcUKuUjALtO8uE8FbBUcY9tsjR+d9vyNWR4ULBbFCD59NxB5apHVwHunWIN8ZvRc
-J96uuMYFAq5BPV32Db/SsMaY/lhE/ftlVBYRFl65L6vXNOUgbS3dctOdiROptEKn
-oidAmp+KMRN/Tnm9VQO/B/SnRWdqrw9FGfX9dlTM9agBTGFcC8zSdK03dbpeBgNU
-79UFJLo7L7Qq2E1KzILBzRM0DJ4lfOJJe51cHAQwMEwykLxOcs046O7YCq9pcnau
-DNeQCM0gBfI8HExIzFKXRw7+2/FYT7XXfwu5e14Y4Z8fwGHRViGDGSi5gwHa3Tuu
-x63eaqm33QeNzN14EusTVMd1a9NpZ+AiCXFr210ap8qDgx8OqdC0uHKS/UBbfnhT
-VYC2NTNxxf1HKXmPftDuOUHlL7pBN+umITtfpl4+m/XBCO0vZzDWle9iV7Luw4VH
-/BzfB1iZMsYoXMF9vNtwUkIbihDNt7Ec/TQrGCptKgl9zLIADW6jTU5njwwvdsFj
-tvtqg02xuANM2w7BqN10q9cr42FDi0yufgH/rwYr9USmcMro2J0=
-=TKfq
------END PGP SIGNATURE-----

fish-3.4.1.tar.xz

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

fish-3.4.1.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEnh3gZzzMAykZ0YUmwLlpspdOiI4FAmI971cACgkQwLlpspdO
+iI6GSg//eGscjK+Six3AEmBAkrtKVwHrXy4Zz+xxQCyjtlHmE+aelIkR9PbT8CLB
+KaiNVd/12z/KPnUWOxbebRi+uYP1TmTh/PRQ1wiNDaXyeIA+QNjrXjL8J/d3MF/C
+V1/4Q6l14PH0H2oU44c7mvyVHDdEr3oi/D8bCM7h4TV7zdtL6kpyj26VsTG8Q4xs
+hJuVIo8Su1HhE1Kw9ujcTjEyunrZzMfKoivLX2v0mk1PGDYj5JT/g/5UsWLKm5Rn
+Oi1DEb8wpjaHtGzSizSTzH9VO9epfoYQn56QF7s/XyRXKzP8ShGekJaqYf/GAWY7
+5Se6bXGoLEcqEenpAtGMgLMRvcb+LRrvzVykQ2xnM4Yd54ihYEunanNFiXk1KPNK
+S2u6y3GJZ6cjgt0qlindyRh/gqxLEz/0G7hgeBNBJg0s+vRozi9lS5w9s52QIt2m
+7BadIMrv6B+9axoqO9IzmGCKVSimfAotw0P0aa/VjTdhVIvOIqEqEI46rRJuIhaL
+keeUSLz01NlwtQvnr2Om71VjN5dS3L5XeR+N5xmVS55wGrbqCawYkuX5tBwjFQA5
+CXg40x2kIgNU76CCgAfXgiEk7ac0W3tXYw1EQYJou3m/UlaX0e5vDb3dV8ZYy1CI
+96JaJkjw91lCpf0ld+FKTKNipsZLFXBV1sksWBEFprlPK41ZprY=
+=P7Mt
+-----END PGP SIGNATURE-----

fish.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Apr  6 20:13:28 UTC 2022 - Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fastmail.net>
+
+- version update to 3.4.1
+  * An error printed after upgrading, where old instances could pick up a newer
+    version of the fish_title function, has been fixed (#8778)
+  * fish builds correctly on NetBSD (#8788) and OpenIndiana (#8780).
+  * nextd-or-forward-word, bound to Alt-Right Arrow by default, was
+    inadvertently changed to move like forward-bigword. This has been
+    corrected (#8790).
+  * funcsave -q and funcsave --quiet now work correctly (#8830).
+  * Issues with the csharp and nmcli completions were corrected.
+  * see https://github.com/fish-shell/fish-shell/releases/tag/3.4.1
+    for more details
+- Drop 8784-old-school-cmd-subst.patch: merged upstream
+
 -------------------------------------------------------------------
 Mon Mar 21 13:20:42 UTC 2022 - Matej Cepl <mcepl@suse.com>
 

fish.spec

@@ -17,7 +17,7 @@
 
 
 Name:           fish
-Version:        3.4.0
+Version:        3.4.1
 Release:        0
 Summary:        The "friendly interactive shell"
 License:        GPL-2.0-only
@@ -25,9 +25,6 @@ Group:          System/Shells
 URL:            https://fishshell.com/
 Source:         https://github.com/fish-shell/fish-shell/releases/download/%{version}/fish-%{version}.tar.xz
 Source1:        https://github.com/fish-shell/fish-shell/releases/download/%{version}/fish-%{version}.tar.xz.asc
-# PATCH-FIX-UPSTREAM 8784-old-school-cmd-subst.patch gh#fish-shell/fish-shell#8784 mcepl@suse.com
-# Fix a syntax error (fish != bash)
-Patch0:         8784-old-school-cmd-subst.patch
 BuildRequires:  cmake
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++