remove rpath runpatch and add check in spec
(cherry picked from commit 55f8500524eab8842ecfc8265a564fc2d0eaabc8)
This commit is contained in:
parent
31ef87ea41
commit
777848f5a9
@ -1,6 +1,6 @@
|
||||
Name: libxkbcommon
|
||||
Version: 0.8.4
|
||||
Release: 4
|
||||
Release: 6
|
||||
Summary: X.Org X11 XKB parsing library
|
||||
License: MIT
|
||||
URL: https://www.x.org
|
||||
@ -10,7 +10,7 @@ Patch0001: backport-add-XKB_KEY_XF86FullScreen-to-solve-could-not-resolve-k
|
||||
|
||||
BuildRequires: autoconf automake libtool pkgconfig(xcb-xkb) >= 1.10
|
||||
BuildRequires: xorg-x11-util-macros byacc flex bison libX11-devel
|
||||
BuildRequires: xorg-x11-proto-devel xkeyboard-config-devel
|
||||
BuildRequires: xorg-x11-proto-devel xkeyboard-config-devel chrpath
|
||||
|
||||
Requires: xkeyboard-config
|
||||
|
||||
@ -52,12 +52,24 @@ autoreconf -v --install || exit 1
|
||||
|
||||
%make_build
|
||||
|
||||
%check
|
||||
make check
|
||||
|
||||
%install
|
||||
%make_install
|
||||
|
||||
%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
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
@ -77,6 +89,7 @@ autoreconf -v --install || exit 1
|
||||
%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
|
||||
@ -85,6 +98,12 @@ autoreconf -v --install || exit 1
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Feb 9 2021 jinzhimin <jinzhimin2@huawei.com> - 0.8.4-6
|
||||
- add check in spec
|
||||
|
||||
* Tue Feb 9 2021 jinzhimin <jinzhimin2@huawei.com> - 0.8.4-5
|
||||
- remove rpath and runpath of exec files and libraries
|
||||
|
||||
* Fri Jan 29 2021 chengguipeng<chengguipeng1@huawei.com> - 0.8.4-4
|
||||
- Type: bugfix
|
||||
- ID: NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user