From 6e37d3cc8299ba9da567db0167a49fa809446433 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 10 Apr 2019 14:32:52 +0200 Subject: [PATCH] Added patch with rpath remove. --- zimlib-no-rpath.patch | 26 ++++++++++++++++++++++++++ zimlib.spec | 4 ++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 zimlib-no-rpath.patch diff --git a/zimlib-no-rpath.patch b/zimlib-no-rpath.patch new file mode 100644 index 0000000..eacfda6 --- /dev/null +++ b/zimlib-no-rpath.patch @@ -0,0 +1,26 @@ +From dd7e0ec915e4ad782328b496677bf7b122282560 Mon Sep 17 00:00:00 2001 +From: Vitaly Zaitsev +Date: Wed, 10 Apr 2019 14:31:32 +0200 +Subject: [PATCH] Removed Rpath build. + +--- + src/meson.build | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src/meson.build b/src/meson.build +index 671a23f..003047d 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -71,8 +71,6 @@ libzim = library('zim', + link_args : extra_link_args, + cpp_args : extra_cpp_args, + version: meson.project_version(), +- install : true, +- build_rpath : join_paths(get_option('prefix'), get_option('libdir')), +- install_rpath: '$ORIGIN') ++ install : true) + libzim_dep = declare_dependency(link_with: libzim, + include_directories: include_directory) +-- +2.20.1 + diff --git a/zimlib.spec b/zimlib.spec index fe790d7..54d68d0 100644 --- a/zimlib.spec +++ b/zimlib.spec @@ -9,6 +9,7 @@ Summary: Reference implementation of the ZIM specification URL: https://github.com/openzim/%{appname} Source0: %{url}/archive/%{version}.tar.gz +Patch0: %{name}-no-rpath.patch BuildRequires: xapian-core-devel BuildRequires: libicu-devel @@ -33,8 +34,7 @@ Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %{summary}. %prep -%autosetup -n %{appname}-%{version} -sed -e '/rpath/d' -i src/meson.build +%autosetup -n %{appname}-%{version} -p1 %build %meson