From fd756352ffe0fbc4c7dade3687d4ac94ac2a7f89d6acc10f415a823169f233e3 Mon Sep 17 00:00:00 2001 From: Fuminobu Takeyama Date: Thu, 31 Mar 2022 01:51:31 +0000 Subject: [PATCH] Accepting request 966090 from home:ftake:branches:M17N - Add install/uninstall scripts for the user service files - Drop ibus-missing-include.patch * fix build error under Leap 15.4 OBS-URL: https://build.opensuse.org/request/show/966090 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=263 --- ibus-missing-include.patch | 88 -------------------------------------- ibus.changes | 7 +++ ibus.spec | 18 +++++--- 3 files changed, 19 insertions(+), 94 deletions(-) delete mode 100644 ibus-missing-include.patch diff --git a/ibus-missing-include.patch b/ibus-missing-include.patch deleted file mode 100644 index 56ebe37..0000000 --- a/ibus-missing-include.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff -Naur ibus-1.5.25/conf/dconf/main.c ibus-1.5.25.new/conf/dconf/main.c ---- ibus-1.5.25/conf/dconf/main.c 2021-08-20 02:48:40.000000000 +0200 -+++ ibus-1.5.25.new/conf/dconf/main.c 2021-09-08 13:53:17.833396607 +0200 -@@ -21,6 +21,7 @@ - * USA - */ - -+#include - #include - #include - #include -diff -Naur ibus-1.5.25/conf/memconf/main.c ibus-1.5.25.new/conf/memconf/main.c ---- ibus-1.5.25/conf/memconf/main.c 2021-08-20 02:48:40.000000000 +0200 -+++ ibus-1.5.25.new/conf/memconf/main.c 2021-09-08 13:53:43.513361844 +0200 -@@ -19,6 +19,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA - */ -+#include - #include - #include - #include -diff -Naur ibus-1.5.25/portal/portal.c ibus-1.5.25.new/portal/portal.c ---- ibus-1.5.25/portal/portal.c 2021-08-20 02:48:40.000000000 +0200 -+++ ibus-1.5.25.new/portal/portal.c 2021-09-08 14:07:36.300242490 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #include "ibus-portal-dbus.h" - -diff -Naur ibus-1.5.25/src/ibuscomposetable.c ibus-1.5.25.new/src/ibuscomposetable.c ---- ibus-1.5.25/src/ibuscomposetable.c 2021-08-20 02:48:40.000000000 +0200 -+++ ibus-1.5.25.new/src/ibuscomposetable.c 2021-09-08 13:15:25.184529800 +0200 -@@ -19,6 +19,7 @@ - * USA - */ - -+#include - #include - #include - #include -diff -Naur ibus-1.5.25/src/ibusemoji.c ibus-1.5.25.new/src/ibusemoji.c ---- ibus-1.5.25/src/ibusemoji.c 2021-08-20 02:48:40.000000000 +0200 -+++ ibus-1.5.25.new/src/ibusemoji.c 2021-09-08 13:22:14.227971403 +0200 -@@ -23,6 +23,7 @@ - #include - #endif - -+#include - #include - #include - #include "ibusemoji.h" -diff -Naur ibus-1.5.25/src/ibusregistry.c ibus-1.5.25.new/src/ibusregistry.c ---- ibus-1.5.25/src/ibusregistry.c 2021-08-20 02:48:40.000000000 +0200 -+++ ibus-1.5.25.new/src/ibusregistry.c 2021-09-08 13:25:08.191728353 +0200 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include "ibusinternal.h" - #include "ibusmarshalers.h" -diff -Naur ibus-1.5.25/src/ibusshare.c ibus-1.5.25.new/src/ibusshare.c ---- ibus-1.5.25/src/ibusshare.c 2021-08-20 02:48:40.000000000 +0200 -+++ ibus-1.5.25.new/src/ibusshare.c 2021-09-08 13:29:17.527380024 +0200 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - static gchar *_display = NULL; - -diff -Naur ibus-1.5.25/src/ibusunicode.c ibus-1.5.25.new/src/ibusunicode.c ---- ibus-1.5.25/src/ibusunicode.c 2021-08-20 02:48:40.000000000 +0200 -+++ ibus-1.5.25.new/src/ibusunicode.c 2021-09-08 13:32:06.475144580 +0200 -@@ -23,6 +23,7 @@ - #include - #endif - -+#include - #include - #include - #include "ibusinternal.h" diff --git a/ibus.changes b/ibus.changes index 2e2ae9f..2236c52 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 29 13:47:00 UTC 2022 - Fuminobu Takeyama + +- Add install/uninstall scripts for the user service files +- Drop ibus-missing-include.patch + * fix build error under Leap 15.4 + ------------------------------------------------------------------- Sun Mar 27 04:28:04 UTC 2022 - Hillwood Yang diff --git a/ibus.spec b/ibus.spec index db9426f..a9ee158 100644 --- a/ibus.spec +++ b/ibus.spec @@ -72,7 +72,6 @@ Patch12: ibus-disable-engines-preload-in-GNOME.patch # Qt5 does not be update to the new version and patch for ibus on Leap 15, # it still needs this patch on leap 15. (boo#1187202) Patch15: ibus-socket-name-compatibility.patch -Patch16: ibus-missing-include.patch BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(systemd) %if ! 0%{?with_gtk4} @@ -99,6 +98,7 @@ BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(vapigen) BuildRequires: pkgconfig(xkbcommon) +BuildRequires: systemd-rpm-macros %if %{with_emoji} Requires: %{_name}-dict-emoji = %{version} %endif @@ -210,7 +210,6 @@ This package contains ibus im module for use by gtk4. %prep %setup -q -n %{_name}-%{version} -#%patch0 -p1 %patch4 -p1 %patch8 -p1 %if 0%{?sle_version} < 150200 && 0%{?suse_version} <=1500 @@ -229,7 +228,6 @@ cp -r %{SOURCE11} . %patch12 -p1 %if 0%{?suse_version} <= 1500 %patch15 -p1 -%patch16 -p1 %endif %build @@ -311,15 +309,23 @@ install -m 644 %{SOURCE7} %{buildroot}%{_rpmmacrodir} %find_lang ibus10 %{?no_lang_C} +%pre +%systemd_user_pre org.freedesktop.IBus.session.GNOME.service org.freedesktop.IBus.session.generic.service + %post %glib2_gsettings_schema_post +%systemd_user_post org.freedesktop.IBus.session.GNOME.service org.freedesktop.IBus.session.generic.service %posttrans dconf update +%preun +%systemd_user_preun org.freedesktop.IBus.session.GNOME.service org.freedesktop.IBus.session.generic.service + %postun %glib2_gsettings_schema_postun dconf update +%systemd_user_postun org.freedesktop.IBus.session.GNOME.service org.freedesktop.IBus.session.generic.service %post gtk %{gtk2_immodule_post} @@ -409,9 +415,9 @@ fi %{_mandir}/man1/ibus-setup.1%{ext_man} %{_mandir}/man5/00-upstream-settings.5%{ext_man} %{_mandir}/man5/ibus.5%{ext_man} -%dir %{_prefix}/lib/systemd/user/gnome-session.target.wants -%{_prefix}/lib/systemd/user/gnome-session.target.wants/org.freedesktop.IBus.session.GNOME.service -%{_prefix}/lib/systemd/user/*.service +%dir %{_userunitdir}/gnome-session.target.wants +%{_userunitdir}/gnome-session.target.wants/org.freedesktop.IBus.session.GNOME.service +%{_userunitdir}/*.service %if %{with_emoji} %{_datadir}/applications/org.freedesktop.IBus.Panel.Emojier.desktop