pool/fish
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 871024 from shells

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/871024
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fish?expand=0&rev=25
This commit is contained in:
Dominique Leuenberger 2021-02-15 22:11:36 +00:00 committed by Git OBS Bridge
commit 280b66c211
3 changed files with 141 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fish.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Feb 8 00:14:35 UTC 2021 - Simon Lees <sflees@suse.de>
- pc file contained references to /usr/local (boo#1181888)
* fix-pc-file-paths.patch - Already fixed upstream
-------------------------------------------------------------------
Sun Aug 9 14:56:41 UTC 2020 - Sam Yu <ytz1995@hotmail.com>
@ -523,4 +529,3 @@ Sat May 18 06:36:25 UTC 2013 - mailaender@opensuse.org
Sat Mar 28 00:00:00 UTC 2009 - bitshuffler@opensuse.org
- Initial RPM

3
fish.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package fish
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -24,6 +24,7 @@ License: GPL-2.0-only
Group: System/Shells
URL: https://fishshell.com/
Source: https://github.com/fish-shell/fish-shell/releases/download/%{version}/fish-%{version}.tar.gz
Patch0: fix-pc-file-paths.patch
BuildRequires: cmake
BuildRequires: doxygen
BuildRequires: gcc-c++

23
fix-pc-file-paths.patch Normal file
View File

@ -0,0 +1,23 @@
Index: fish-3.1.2/cmake/Install.cmake
===================================================================
--- fish-3.1.2.orig/cmake/Install.cmake
+++ fish-3.1.2/cmake/Install.cmake
@@ -25,15 +25,15 @@ SET(configure_input
DO NOT MANUALLY EDIT THIS FILE!")
SET(extra_completionsdir
- /usr/local/share/fish/vendor_completions.d
+ ${CMAKE_INSTALL_FULL_DATADIR}/fish/vendor_completions.d
CACHE STRING "Path for extra completions")
SET(extra_functionsdir
- /usr/local/share/fish/vendor_functions.d
+ ${CMAKE_INSTALL_FULL_DATADIR}/fish/vendor_functions.d
CACHE STRING "Path for extra functions")
SET(extra_confdir
- /usr/local/share/fish/vendor_conf.d
+ ${CMAKE_INSTALL_FULL_DATADIR}/fish/vendor_conf.d
CACHE STRING "Path for extra configuration")
# These are the man pages that go in system manpath; all manpages go in the fish-specific manpath.