[packages/fish] fix incorrect assumption that CMAKE_INSTALL_DATADIR must be relative; rel 2

atler atler at pld-linux.org
Mon Jul 19 20:44:54 CEST 2021


commit fb402012b6a993a4839155901c0277cc87046346
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Jul 19 20:43:29 2021 +0200

    fix incorrect assumption that CMAKE_INSTALL_DATADIR must be relative; rel 2

 fish-rel_datadir.patch | 15 +++++++++++++++
 fish.spec              |  4 +++-
 2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/fish.spec b/fish.spec
index 028ca2a..861b898 100644
--- a/fish.spec
+++ b/fish.spec
@@ -2,12 +2,13 @@ Summary:	fish - A friendly interactive shell
 Summary(pl.UTF-8):	fish - przyjazna interaktywna powłoka
 Name:		fish
 Version:	3.3.1
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/Shells
 Source0:	https://github.com/fish-shell/fish-shell/releases/download/%{version}/%{name}-%{version}.tar.xz
 # Source0-md5:	94be285255aadfcf0f910bdcc2f56073
 Patch0:		%{name}-no_lld.patch
+Patch1:		%{name}-rel_datadir.patch
 URL:		http://fishshell.com/
 BuildRequires:	cmake >= 3.2
 BuildRequires:	gettext-tools
@@ -48,6 +49,7 @@ Pliki programistyczne dla fish.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python$,%{__python},' share/tools/{deroff.py,create_manpage_completions.py,web_config/webconfig.py}
 
diff --git a/fish-rel_datadir.patch b/fish-rel_datadir.patch
new file mode 100644
index 0000000..1b2a55a
--- /dev/null
+++ b/fish-rel_datadir.patch
@@ -0,0 +1,15 @@
+--- fish-3.3.1/cmake/Install.cmake.orig	2021-07-06 16:45:37.000000000 +0200
++++ fish-3.3.1/cmake/Install.cmake	2021-07-19 20:04:46.496541738 +0200
+@@ -14,7 +14,11 @@
+ set(sysconfdir ${CMAKE_INSTALL_SYSCONFDIR})
+ set(mandir ${CMAKE_INSTALL_MANDIR})
+ 
+-set(rel_datadir ${CMAKE_INSTALL_DATADIR})
++if(IS_ABSOLUTE ${CMAKE_INSTALL_DATADIR})
++  file(RELATIVE_PATH rel_datadir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_DATADIR})
++else()
++  set(rel_datadir ${CMAKE_INSTALL_DATADIR})
++endif()
+ set(datadir ${CMAKE_INSTALL_FULL_DATADIR})
+ 
+ set(docdir ${CMAKE_INSTALL_DOCDIR})
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/fish.git/commitdiff/fb402012b6a993a4839155901c0277cc87046346



More information about the pld-cvs-commit mailing list