!32 [sync] PR-30: revert remove rpath
From: @openeuler-sync-bot Reviewed-by: @t_feng Signed-off-by: @t_feng
This commit is contained in:
commit
f11a7bfca8
@ -1,6 +1,6 @@
|
||||
Name: libxkbcommon
|
||||
Version: 1.3.1
|
||||
Release: 3
|
||||
Release: 4
|
||||
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 chrpath
|
||||
BuildRequires: libxml2-devel
|
||||
Requires: xkeyboard-config
|
||||
|
||||
%description
|
||||
@ -62,16 +62,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%delete_la
|
||||
|
||||
# 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
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%check
|
||||
%meson_test
|
||||
@ -101,7 +92,6 @@ echo "/usr/lib64" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
|
||||
%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
|
||||
@ -123,6 +113,11 @@ echo "/usr/lib64" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
|
||||
%{_mandir}/man1/xkbcli.1.gz
|
||||
|
||||
%changelog
|
||||
* Wed Aug 03 2022 wangkerong <wangkerong@h-partners.com> - 1.3.1-4
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC:revert remove rpath,this is redundant code
|
||||
|
||||
* Sat Jun 11 2022 wangkerong <wangkerong@h-partners.com> - 1.3.1-3
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user