From d1fde8539084f86ef064cd3759af1bdb48523314 Mon Sep 17 00:00:00 2001 From: lingsheng Date: Fri, 10 Sep 2021 17:23:12 +0800 Subject: [PATCH] Delete rpath setting (cherry picked from commit 9b27ca4775ab076951ef6df31d3c33afdec3d0ef) --- epiphany.spec | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/epiphany.spec b/epiphany.spec index fee6a94..5c1b971 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -4,7 +4,7 @@ Name: epiphany Epoch: 1 Version: 3.38.5 -Release: 1 +Release: 2 Summary: Web browser for GNOME License: GPL-3.0+ and LGPL-2.1 and MIT and GPL+ and ISC URL: https://wiki.gnome.org/Apps/Web @@ -25,7 +25,7 @@ BuildRequires: pkgconfig(libhandy-1) pkgconfig(libnotify) pkgconfig(libpor BuildRequires: pkgconfig(libsoup-2.4) pkgconfig(libxml-2.0) pkgconfig(libxslt) BuildRequires: pkgconfig(nettle) pkgconfig(sqlite3) BuildRequires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk3_version} -BuildRequires: pkgconfig(webkit2gtk-web-extension-4.0) >= %{webkit2gtk3_version} +BuildRequires: pkgconfig(webkit2gtk-web-extension-4.0) >= %{webkit2gtk3_version} chrpath Requires: %{name}-runtime%{?_isa} = %{epoch}:%{version}-%{release} %description Epiphany is the web browser for the GNOME desktop. Its goal is to be @@ -52,6 +52,21 @@ installing the epiphany application itself. %meson_install %find_lang %{name} --with-gnome +chrpath -d %{buildroot}%{_libdir}/epiphany/*.so +chrpath -d %{buildroot}%{_libdir}/epiphany/web-process-extensions/*.so +chrpath -d %{buildroot}%{_libexecdir}/epiphany/* +chrpath -d %{buildroot}%{_libexecdir}/epiphany-search-provider +chrpath -d %{buildroot}%{_bindir}/epiphany + +mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d +echo "%{_libdir}/epiphany" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + %check desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop @@ -63,6 +78,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop %dir %{_datadir}/gnome-shell/ %dir %{_datadir}/gnome-shell/search-providers/ %{_datadir}/gnome-shell/search-providers/org.gnome.Epiphany.SearchProvider.ini +%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf %files runtime %license COPYING @@ -75,8 +91,12 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop %{_libdir}/epiphany/ %{_datadir}/epiphany %{_mandir}/man*/* +%config(noreplace)%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf %changelog +* Fri Sep 10 2021 lingsheng - 3.38.5-2 +- Delete rpath setting + * Thu Jun 24 2021 Wenlong Ding - 3.38.5-1 - Update to 3.38.5 -- Gitee