!13 [sync] PR-10: remove rpath runpatch and add check in spec
From: @openeuler-sync-bot Reviewed-by: @yanan-rock Signed-off-by: @yanan-rock
This commit is contained in:
commit
e02f102057
@ -1,6 +1,6 @@
|
|||||||
Name: libxkbcommon
|
Name: libxkbcommon
|
||||||
Version: 0.8.4
|
Version: 0.8.4
|
||||||
Release: 4
|
Release: 6
|
||||||
Summary: X.Org X11 XKB parsing library
|
Summary: X.Org X11 XKB parsing library
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: https://www.x.org
|
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: autoconf automake libtool pkgconfig(xcb-xkb) >= 1.10
|
||||||
BuildRequires: xorg-x11-util-macros byacc flex bison libX11-devel
|
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
|
Requires: xkeyboard-config
|
||||||
|
|
||||||
@ -52,12 +52,24 @@ autoreconf -v --install || exit 1
|
|||||||
|
|
||||||
%make_build
|
%make_build
|
||||||
|
|
||||||
|
%check
|
||||||
|
make check
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install
|
%make_install
|
||||||
|
|
||||||
%delete_la
|
%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
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
@ -77,6 +89,7 @@ autoreconf -v --install || exit 1
|
|||||||
%files x11
|
%files x11
|
||||||
%{_libdir}/libxkbcommon-x11.so.0.0.0
|
%{_libdir}/libxkbcommon-x11.so.0.0.0
|
||||||
%{_libdir}/libxkbcommon-x11.so.0
|
%{_libdir}/libxkbcommon-x11.so.0
|
||||||
|
%config(noreplace) /etc/ld.so.conf.d/*
|
||||||
|
|
||||||
%files x11-devel
|
%files x11-devel
|
||||||
%{_libdir}/libxkbcommon-x11.so
|
%{_libdir}/libxkbcommon-x11.so
|
||||||
@ -85,6 +98,12 @@ autoreconf -v --install || exit 1
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* Fri Jan 29 2021 chengguipeng<chengguipeng1@huawei.com> - 0.8.4-4
|
||||||
- Type: bugfix
|
- Type: bugfix
|
||||||
- ID: NA
|
- ID: NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user