From b8542e4cabc0bbd4669b50336baddf5d9797a2d9 Mon Sep 17 00:00:00 2001 From: mgb01105731 Date: Thu, 3 Nov 2022 10:35:18 +0800 Subject: [PATCH] optimise spec file --- ibus.spec | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/ibus.spec b/ibus.spec index c071d65..3ce09c9 100644 --- a/ibus.spec +++ b/ibus.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %global with_pkg_config %(pkg-config --version >/dev/null 2>&1 && echo -n "1" || echo -n "0") %global ibus_api_version 1.0 @@ -69,9 +69,9 @@ BuildRequires: systemd # for ibus-keypress BuildRequires: libXtst-devel -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: (%{name}-gtk2%{?_isa} = %{version}-%{release} if gtk2) -Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +Requires: (%{name}-gtk2 = %{version}-%{release} if gtk2) +Requires: %{name}-gtk3 = %{version}-%{release} Requires: %{name}-setup = %{version}-%{release} Requires: iso-codes @@ -109,7 +109,7 @@ This package contains the libraries for IBus %package gtk2 Summary: IBus IM module for GTK2 -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: glib2 >= %{glib_ver} Requires(post): glib2 >= %{glib_ver} Provides: ibus-gtk = %{version}-%{release} @@ -120,7 +120,7 @@ This package contains IBus IM module for GTK2 %package gtk3 Summary: IBus IM module for GTK3 -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: glib2 >= %{glib_ver} Requires(post): glib2 >= %{glib_ver} @@ -130,7 +130,7 @@ This package contains IBus IM module for GTK3 %if %{with gtk4} %package gtk4 Summary: IBus IM module for GTK4 -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: glib2 >= %{glib_ver} Requires(post): glib2 >= %{glib_ver} @@ -153,14 +153,14 @@ This is a setup utility for IBus. %package wayland Summary: IBus IM module for Wayland -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description wayland This package contains IBus IM module for Wayland %package devel Summary: Development tools for ibus -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: dbus-devel Requires: glib2-devel Requires: gettext @@ -191,7 +191,7 @@ desktop testing runner internally. %package tests Summary: Tests for the %{name} package -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description tests The %{name}-tests package contains tests that can be used to verify @@ -277,6 +277,8 @@ desktop-file-install --delete-original \ # FIXME: no version number %find_lang %{name}10 +%generate_compatibility_deps + %check make check \ DISABLE_GUI_TESTS="ibus-compose ibus-keypress test-stress" \ @@ -317,6 +319,8 @@ dconf update || : %dir %{_datadir}/ibus/ %{_bindir}/ibus %{_bindir}/ibus-daemon +%{abidir}/ibus-option.list +%{abidir}/ibus-daemon-option.list %{_datadir}/applications/org.freedesktop.IBus.Panel.Emojier.desktop %{_datadir}/applications/org.freedesktop.IBus.Panel.Extension.Gtk3.desktop %{_datadir}/bash-completion/completions/ibus.bash @@ -360,9 +364,12 @@ dconf update || : %ghost %pkgcache/bus/registry %files libs +%dir %{abidir} %{_libdir}/libibus-*%{ibus_api_version}.so.* %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/IBus*-1.0.typelib +%{abidir}/libibus-*%{ibus_api_version}.dump +%{abidir}/im-ibus.dump %files gtk2 %{_libdir}/gtk-2.0/%{gtk2_binary_version}/immodules/im-ibus.so @@ -375,6 +382,8 @@ dconf update || : %{_libdir}/gtk-4.0/%{gtk4_binary_version}/immodules/libim-ibus.so %endif +%{abidir}/libim-ibus.dump + # The setup package won't include icon files so that # gtk-update-icon-cache is executed in the main package only one time. %files setup @@ -406,6 +415,7 @@ dconf update || : %files desktop-testing %{_bindir}/ibus-desktop-testing-runner +%{abidir}/ibus-desktop-testing-runner-option.list %{_datadir}/ibus/tests %{_libexecdir}/ibus-desktop-testing-autostart @@ -416,5 +426,8 @@ dconf update || : %{_datadir}/installed-tests/ibus %changelog +* Thu Nov 03 2022 mgb01105731 - 1.5.25-2 +- optimise spec file + * Tue Apr 12 2022 Chunmei Xu - 1.5.25-1 - init from upstream -- Gitee