From 46f970c484c42a78199115f2395d431f7bd4888c Mon Sep 17 00:00:00 2001
From: kerongw <wangkerong@h-partners.com>
Date: Sat, 11 Jun 2022 06:29:52 +0000
Subject: [PATCH 1/2] remove rpath

(cherry picked from commit e339f0054e8759c76c0216fd7d0a527080ec52dd)
---
 libxkbcommon.spec | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/libxkbcommon.spec b/libxkbcommon.spec
index 6fc70ec..69a9a3d 100644
--- a/libxkbcommon.spec
+++ b/libxkbcommon.spec
@@ -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 <wangkerong@h-partners.com> - 1.3.1-3
+- CVE:NA
+- SUG:NA
+- DESC:remove rpath
+
 * Tue Apr 19 2022 dongyuzhen <dongyuzhen@h-partners.com> - 1.3.1-2
 - enable test
 
-- 
Gitee


From a37dd389ca9a6320242bad6cc3ed4063ff4f2b7c Mon Sep 17 00:00:00 2001
From: kerongw <wangkerong@h-partners.com>
Date: Thu, 16 Jun 2022 03:12:42 +0000
Subject: [PATCH 2/2] update version

---
 libxkbcommon.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libxkbcommon.spec b/libxkbcommon.spec
index 69a9a3d..f7d7f4c 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
-- 
Gitee