From ffb03d7677a1a1a70c2939bfea1158a3b38259cfe4201190550b1acbd7376ad8 Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Sat, 20 Jan 2024 13:45:30 +0000 Subject: [PATCH] Accepting request 1139984 from home:gmbr3:Active - Use %_libexecdir as the basis of %_ibus_libexecdir (bsc#1174075) OBS-URL: https://build.opensuse.org/request/show/1139984 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=283 --- ibus.changes | 5 +++++ ibus.spec | 6 +++--- macros.ibus | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ibus.changes b/ibus.changes index e8a3753..2a3d5b6 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 19 15:23:25 UTC 2024 - Callum Farmer + +- Use %_libexecdir as the basis of %_ibus_libexecdir (bsc#1174075) + ------------------------------------------------------------------- Sat Dec 2 08:30:07 UTC 2023 - Hillwood Yang diff --git a/ibus.spec b/ibus.spec index a985abd..390ef37 100644 --- a/ibus.spec +++ b/ibus.spec @@ -239,7 +239,7 @@ cp -r %{SOURCE11} . %build %configure --disable-static \ - --libexecdir=%{_libdir}/ibus \ + --libexecdir=%{_libexecdir}/ibus \ %if %{with_wayland} --enable-wayland \ %endif @@ -359,7 +359,7 @@ dconf update rm -rf %{buildroot}%{_datadir} rm -rf %{buildroot}%{_includedir} rm -rf %{buildroot}%{_bindir} -rm -rf %{buildroot}%{_libdir}/ibus +rm -rf %{buildroot}%{_libexecdir}/ibus rm -rf %{buildroot}%{_libdir}/libibus* rm -rf %{buildroot}%{_libdir}/pkgconfig rm -rf %{buildroot}%{_prefix}/lib/systemd @@ -412,7 +412,7 @@ fi %{_datadir}/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml %{_datadir}/icons/hicolor/*/apps/ibus*.* %{_datadir}/pixmaps/ibus-keyboard.png -%{_libdir}/ibus +%{_libexecdir}/ibus %{_datadir}/bash-completion/completions/ibus.bash %{_datadir}/dbus-1/services/*.service # This file is generated by dconf update diff --git a/macros.ibus b/macros.ibus index 2328ddf..a8c6de8 100644 --- a/macros.ibus +++ b/macros.ibus @@ -5,7 +5,7 @@ # Use %%ibus_table_requires as requires %_ibus_includedir %{_includedir}/ibus-1.0 %_ibus_libdir %{_libdir}/ibus -%_ibus_libexecdir %{_ibus_libdir} +%_ibus_libexecdir %{_libexecdir}/ibus %_ibus_datadir %{_datadir}/ibus %_ibus_componentdir %{_ibus_datadir}/component %_ibus_enginedir %{_ibus_datadir}/engine