diff --git a/libxkbcommon.spec b/libxkbcommon.spec index 6fc70ec3c91c69219fcfc7e1b71f2e8c26afe908..f7d7f4cc9115004f14dab1de70392def7b52bed2 100644 --- a/libxkbcommon.spec +++ b/libxkbcommon.spec @@ -1,6 +1,6 @@ Name: libxkbcommon Version: 1.3.1 -Release: 2 +Release: 3 Summary: X.Org X11 XKB parsing library License: MIT URL: https://www.x.org @@ -11,7 +11,7 @@ BuildRequires: xorg-x11-util-macros byacc flex bison BuildRequires: xorg-x11-proto-devel libX11-devel BuildRequires: xkeyboard-config-devel BuildRequires: pkgconfig(xcb-xkb) >= 1.10 -BuildRequires: libxml2-devel +BuildRequires: libxml2-devel chrpath Requires: xkeyboard-config %description @@ -62,7 +62,16 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %delete_la -%ldconfig_scriptlets +# remove rpath +chrpath -d %{buildroot}%{_libdir}/libxkbcommon-x11.so.0.0.0 +mkdir -p %{buildroot}/etc/ld.so.conf.d +echo "/usr/lib64" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf + +%post x11 +/sbin/ldconfig + +%postun x11 +/sbin/ldconfig %check %meson_test @@ -92,6 +101,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %files x11 %{_libdir}/libxkbcommon-x11.so.0.0.0 %{_libdir}/libxkbcommon-x11.so.0 +%config(noreplace) /etc/ld.so.conf.d/* %files x11-devel %{_libdir}/libxkbcommon-x11.so @@ -113,6 +123,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %{_mandir}/man1/xkbcli.1.gz %changelog +* Sat Jun 11 2022 wangkerong - 1.3.1-3 +- CVE:NA +- SUG:NA +- DESC:remove rpath + * Tue Apr 19 2022 dongyuzhen - 1.3.1-2 - enable test