From 9529cfc17a904d47608e5135f21cb2d7e1799e45 Mon Sep 17 00:00:00 2001 From: lingsheng Date: Thu, 9 Sep 2021 16:04:07 +0800 Subject: [PATCH] Delete rpath setting (cherry picked from commit 3c88c8e15fc77e0d88fc978dfe79e4e33b134559) --- gnome-settings-daemon.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index df7395f..dbd4ffc 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,6 +1,6 @@ Name: gnome-settings-daemon Version: 3.38.2 -Release: 1 +Release: 2 Summary: Settings of GNOME Sessions and related applications License: GPLv2+ URL: https://download.gnome.org/sources/%{name} @@ -16,7 +16,7 @@ BuildRequires: pkgconfig(lcms2) >= 2.2 pkgconfig(libcanberra-gtk3) pkgconfig(li BuildRequires: pkgconfig(libnm) pkgconfig(libnotify) pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib) BuildRequires: pkgconfig(librsvg-2.0) pkgconfig(nss) pkgconfig(polkit-gobject-1) pkgconfig(upower-glib) BuildRequires: pkgconfig(x11) pkgconfig(xi) pkgconfig(xtst) pkgconfig(wayland-client) -BuildRequires: pkgconfig(libwacom) >= 0.7 pkgconfig(xorg-wacom) pkgconfig(gcr-base-3) pkgconfig(mm-glib) +BuildRequires: pkgconfig(libwacom) >= 0.7 pkgconfig(xorg-wacom) pkgconfig(gcr-base-3) pkgconfig(mm-glib) chrpath Requires: colord geoclue2 >= 2.3.1 geocode-glib >= 3.10.0 glib2 >= 2.53.0 Requires: gnome-desktop3 >= 3.27.90 gsettings-desktop-schemas >= 3.23.3 @@ -54,6 +54,16 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas install -d $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/gtk-modules +chrpath -d %{buildroot}%{_libexecdir}/* +mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d +echo "%{_libdir}/gnome-settings-daemon-3.0" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + %files -f %{name}.lang %doc AUTHORS NEWS %license COPYING @@ -65,6 +75,7 @@ install -d $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/gtk-modules %{_datadir}/glib-2.0/schemas/* %{_datadir}/polkit-1/actions/* %{_libdir}/gnome-settings-daemon-3.0/libgsd.so +%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf /usr/lib/udev/rules.d/*.rules %{_datadir}/gnome-settings-daemon/ @@ -75,6 +86,9 @@ install -d $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/gtk-modules %{_libdir}/pkgconfig/gnome-settings-daemon.pc %changelog +* Thu Sep 09 2021 lingsheng - 3.38.2-2 +- Delete rpath setting + * Mon May 24 2021 weijin deng - 3.38.2-1 - Upgrade to 3.38.2 - Update Version, Release, stage 'files' -- Gitee