From a5e7ecebd608ccc54a6ef737c2cc2517874fa39a Mon Sep 17 00:00:00 2001 From: caodongxia <315816521@qq.com> Date: Wed, 24 Aug 2022 18:43:43 +0800 Subject: [PATCH] Remove rpath (cherry picked from commit 4ac38337a26c4a1f6392a222d10365f14070b478) --- gnome-software.spec | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnome-software.spec b/gnome-software.spec index 1b73763..959728c 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -11,7 +11,7 @@ Name: gnome-software Version: 42.2 -Release: 1 +Release: 2 Summary: GNOME software Store License: GPLv2+ URL: https://wiki.gnome.org/Apps/Software @@ -32,6 +32,7 @@ BuildRequires: pkgconfig(libadwaita-1) >= %{libadwaita_version} BuildRequires: libxmlb-devel >= %{libxmlb_version} BuildRequires: PackageKit-glib-devel >= %{packagekit_version} BuildRequires: flatpak-devel >= %{flatpak_version} +BuildRequires: chrpath #BuildRequires: sysprof-capture-devel #BuildRequires: malcontent-devel #BuildRequires: malcontent-ui-devel @@ -92,9 +93,23 @@ install -d %{buildroot}%{_datadir}/gnome-software/backgrounds %find_lang %name --with-gnome +chrpath -d %{buildroot}%{_libdir}/%{name}/plugins-18/libgs_plugin_rpm-ostree.so +chrpath -d %{buildroot}%{_libexecdir}/gnome-software-cmd +chrpath -d %{buildroot}%{_bindir}/%{name} + +mkdir -p %{buildroot}/etc/ld.so.conf.d +echo "%{_libdir}/%{name}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf +echo "%{_libdir}/rpm-ostree" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf + %check desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + %files -f gnome-software.lang %license COPYING %{_bindir}/gnome-software @@ -114,6 +129,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_datadir}/glib-2.0/schemas/org.gnome.software.gschema.xml %{_libexecdir}/{gnome-software-cmd,gnome-software-restarter} +%config(noreplace) /etc/ld.so.conf.d/* + %files devel %{_libdir}/gnome-software/libgnomesoftware.so %{_libdir}/pkgconfig/gnome-software.pc @@ -127,6 +144,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_mandir}/man1/gnome-software.1.* %changelog +* Wed Aug 24 2022 caodongxia -42.2-2 +- Remove rpath + * Tue Jun 28 2022 weijin deng - 42.2-1 - Update to 42.2